Merge tag 'upstream/3.8'

Upstream version 3.8

246 files changed, 44197 insertions, 40006 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d4cc358..5a008f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -81,12 +81,12 @@ AC_REQUIRE([AC_C_BIGENDIAN])
 AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+    CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
     if test "x$HAVE_DARWIN" = "xyes"; then
-        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
         LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
     else
-        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
     fi
     AUD_CHECK_CFLAGS(-Wtype-limits)
     AUD_CHECK_CXXFLAGS(-Woverloaded-virtual)
@@ -142,9 +142,9 @@ AC_PROG_LN_S
 AC_PATH_PROG([RM], [rm])
 AC_PATH_PROG([MV], [mv])
 AC_PATH_PROG([CP], [cp])
-AC_PATH_PROG([AR], [ar])
-AC_PATH_PROG([RANLIB], [ranlib])
-AC_PATH_PROG([WINDRES], [windres])
+AC_PATH_TOOL([AR], [ar])
+AC_PATH_TOOL([RANLIB], [ranlib])
+AC_PATH_TOOL([WINDRES], [windres])
 
 dnl Check for POSIX threads
 dnl =======================
@@ -193,10 +193,12 @@ AC_ARG_ENABLE(qt,
  USE_QT=$enableval, USE_QT=no)
 
 if test $USE_QT = yes ; then
+    PKG_CHECK_MODULES([QTCORE], [Qt5Core >= 5.2])
     PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets >= 5.2])
     AC_DEFINE(USE_QT, 1, [Define if Qt support enabled])
 
     # needed if Qt was built with -reduce-relocations
+    QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
     QT_CFLAGS="$QT_CFLAGS -fPIC"
 fi
 
diff --git a/config.h.in b/config.h.in
index 19fddce..c7a8476 100644
--- a/config.h.in
+++ b/config.h.in
@@ -46,6 +46,9 @@
 /* Define if using libav */
 #undef HAVE_LIBAV
 
+/* Define if libcue version is >= 2.0 */
+#undef HAVE_LIBCUE2
+
 /* Define to 1 if you have the <lirc/lirc_client.h> header file. */
 #undef HAVE_LIRC_LIRC_CLIENT_H
 
@@ -82,9 +85,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* X Composite extension available */
-#undef HAVE_XCOMPOSITE
-
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
diff --git a/configure b/configure
index ce95946..c94fb17 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 audacious-plugins 3.7.2.
+# Generated by GNU Autoconf 2.69 for audacious-plugins 3.8.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.7.2'
-PACKAGE_STRING='audacious-plugins 3.7.2'
+PACKAGE_VERSION='3.8'
+PACKAGE_STRING='audacious-plugins 3.8'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -651,74 +651,67 @@ EFFECT_PLUGIN_DIR
 OUTPUT_PLUGIN_DIR
 INPUT_PLUGIN_DIR
 plugindir
+FILEWRITER_LIBS
+FILEWRITER_CFLAGS
+SDL_LIBS
+SDL_CFLAGS
+FFMPEG_LIBS
+FFMPEG_CFLAGS
 QTOPENGL_LIBS
 QTOPENGL_CFLAGS
+QTMULTIMEDIA_LIBS
+QTMULTIMEDIA_CFLAGS
+AMPACHE_LIBS
+AMPACHE_CFLAGS
+X11EXT_LIBS
+X11EXT_CFLAGS
+GDKX11_LIBS
+GDKX11_CFLAGS
 GL_LIBS
-SOXR_LIBS
-SOXR_CFLAGS
-SAMPLERATE_LIBS
-SAMPLERATE_CFLAGS
-BS2B_LIBS
-BS2B_CFLAGS
-FILEWRITER_LIBS
-FILEWRITER_CFLAGS
-FLAC_LIBS
-FLAC_CFLAGS
-CUE_LIBS
-CUE_CFLAGS
+CURL_LIBS
+CURL_CFLAGS
+have_mpris2
+NOTIFY_LIBS
+NOTIFY_CFLAGS
+DBUS_LIBS
+DBUS_CFLAGS
 MMS_LIBS
 MMS_CFLAGS
 NEON_LIBS
 NEON_CFLAGS
-CURL_LIBS
-CURL_CFLAGS
-CDDB_LIBS
-CDDB_CFLAGS
-CDIO_LIBS
-CDIO_CFLAGS
-FLUIDSYNTH_LIBS
-FLUIDSYNTH_CFLAGS
-SNDIO_LIBS
-SDL_LIBS
-SDL_CFLAGS
+CUE_LIBS
+CUE_CFLAGS
+PULSE_LIBS
+PULSE_CFLAGS
+OSS_CFLAGS
+JACK_LIBS
+JACK_CFLAGS
 ALSA_LIBS
 ALSA_CFLAGS
-OSS_CFLAGS
+SOXR_LIBS
+SOXR_CFLAGS
+SAMPLERATE_LIBS
+SAMPLERATE_CFLAGS
+BS2B_LIBS
+BS2B_CFLAGS
 SIDPLAYFP_LIBS
 SIDPLAYFP_CFLAGS
-JACK_LIBS
-JACK_CFLAGS
-FFMPEG_LIBS
-FFMPEG_CFLAGS
 MODPLUG_LIBS
 MODPLUG_CFLAGS
 SNDFILE_LIBS
 SNDFILE_CFLAGS
-FAAD_LIBS
-FAAD_CFLAGS
 WAVPACK_LIBS
 WAVPACK_CFLAGS
-LIBFLAC_LIBS
-LIBFLAC_CFLAGS
-VORBIS_LIBS
-VORBIS_CFLAGS
-have_mpris2
-NOTIFY_LIBS
-NOTIFY_CFLAGS
-XCOMPOSITE_LIBS
-XCOMPOSITE_CFLAGS
-XRENDER_LIBS
-XRENDER_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GDKX11_LIBS
-GDKX11_CFLAGS
 MPG123_LIBS
 MPG123_CFLAGS
-PULSE_LIBS
-PULSE_CFLAGS
-QTMULTIMEDIA_LIBS
-QTMULTIMEDIA_CFLAGS
+FLUIDSYNTH_LIBS
+FLUIDSYNTH_CFLAGS
+VORBIS_LIBS
+VORBIS_CFLAGS
+LIBFLAC_LIBS
+LIBFLAC_CFLAGS
+CDIO_LIBS
+CDIO_CFLAGS
 XML_CFLAGS
 XML_LIBS
 AUDACIOUS_LIBS
@@ -760,6 +753,8 @@ LIB_CFLAGS
 USE_QT
 QT_LIBS
 QT_CFLAGS
+QTCORE_LIBS
+QTCORE_CFLAGS
 GIO_LIBS
 GIO_CFLAGS
 USE_GTK
@@ -866,48 +861,47 @@ enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
 with_system_libxml2
-enable_console
-enable_qtaudio
-enable_coreaudio
-enable_pulse
-enable_mp3
-enable_hotkey
-enable_gnomeshortcuts
-enable_lirc
-enable_songchange
-enable_aosd
-enable_aosd_xcomp
-enable_notify
-enable_mpris2
+enable_cdaudio
+enable_flac
 enable_vorbis
-enable_flacng
-enable_wavpack
+enable_amidiplug
+enable_mpg123
 enable_aac
+enable_wavpack
 enable_sndfile
 enable_modplug
-with_ffmpeg
-enable_jack
 enable_sid
-enable_oss4
-enable_alsa
-enable_sdlout
-with_libsdl
-enable_sndio
-enable_amidiplug
-enable_cdaudio
-enable_scrobbler2
-enable_neon
-enable_mms
-enable_cue
-enable_filewriter
-enable_filewriter_mp3
-enable_filewriter_flac
+enable_console
 enable_bs2b
 enable_resample
 enable_speedpitch
 enable_soxr
+enable_alsa
+enable_jack
+enable_oss4
+enable_pulse
+enable_sndio
+enable_cue
+enable_neon
+enable_mms
+enable_gnomeshortcuts
+enable_notify
+enable_lirc
+enable_mpris2
+enable_songchange
+enable_scrobbler2
 enable_glspectrum
+enable_hotkey
+enable_aosd
+enable_ampache
+enable_qtaudio
 enable_qtglspectrum
+enable_coreaudio
+with_ffmpeg
+with_libsdl
+enable_sdlout
+enable_filewriter
+enable_filewriter_mp3
 enable_mac_media_keys
 '
       ac_precious_vars='build_alias
@@ -939,72 +933,70 @@ GTK_CFLAGS
 GTK_LIBS
 GIO_CFLAGS
 GIO_LIBS
+QTCORE_CFLAGS
+QTCORE_LIBS
 QT_CFLAGS
 QT_LIBS
 AUDACIOUS_CFLAGS
 AUDACIOUS_LIBS
 XML_CFLAGS
 XML_LIBS
-QTMULTIMEDIA_CFLAGS
-QTMULTIMEDIA_LIBS
-PULSE_CFLAGS
-PULSE_LIBS
-MPG123_CFLAGS
-MPG123_LIBS
-GDKX11_CFLAGS
-GDKX11_LIBS
-DBUS_CFLAGS
-DBUS_LIBS
-XRENDER_CFLAGS
-XRENDER_LIBS
-XCOMPOSITE_CFLAGS
-XCOMPOSITE_LIBS
-NOTIFY_CFLAGS
-NOTIFY_LIBS
-VORBIS_CFLAGS
-VORBIS_LIBS
+CDIO_CFLAGS
+CDIO_LIBS
 LIBFLAC_CFLAGS
 LIBFLAC_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
+FLUIDSYNTH_CFLAGS
+FLUIDSYNTH_LIBS
+MPG123_CFLAGS
+MPG123_LIBS
 WAVPACK_CFLAGS
 WAVPACK_LIBS
 SNDFILE_CFLAGS
 SNDFILE_LIBS
 MODPLUG_CFLAGS
 MODPLUG_LIBS
-FFMPEG_CFLAGS
-FFMPEG_LIBS
-JACK_CFLAGS
-JACK_LIBS
 SIDPLAYFP_CFLAGS
 SIDPLAYFP_LIBS
-ALSA_CFLAGS
-ALSA_LIBS
-SDL_CFLAGS
-SDL_LIBS
-FLUIDSYNTH_CFLAGS
-FLUIDSYNTH_LIBS
-CDIO_CFLAGS
-CDIO_LIBS
-CDDB_CFLAGS
-CDDB_LIBS
-CURL_CFLAGS
-CURL_LIBS
-NEON_CFLAGS
-NEON_LIBS
-MMS_CFLAGS
-MMS_LIBS
-CUE_CFLAGS
-CUE_LIBS
-FLAC_CFLAGS
-FLAC_LIBS
 BS2B_CFLAGS
 BS2B_LIBS
 SAMPLERATE_CFLAGS
 SAMPLERATE_LIBS
 SOXR_CFLAGS
 SOXR_LIBS
+ALSA_CFLAGS
+ALSA_LIBS
+JACK_CFLAGS
+JACK_LIBS
+PULSE_CFLAGS
+PULSE_LIBS
+CUE_CFLAGS
+CUE_LIBS
+NEON_CFLAGS
+NEON_LIBS
+MMS_CFLAGS
+MMS_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
+NOTIFY_CFLAGS
+NOTIFY_LIBS
+CURL_CFLAGS
+CURL_LIBS
+GDKX11_CFLAGS
+GDKX11_LIBS
+X11EXT_CFLAGS
+X11EXT_LIBS
+AMPACHE_CFLAGS
+AMPACHE_LIBS
+QTMULTIMEDIA_CFLAGS
+QTMULTIMEDIA_LIBS
 QTOPENGL_CFLAGS
-QTOPENGL_LIBS'
+QTOPENGL_LIBS
+FFMPEG_CFLAGS
+FFMPEG_LIBS
+SDL_CFLAGS
+SDL_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1545,7 +1537,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 audacious-plugins 3.7.2 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1612,7 +1604,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of audacious-plugins 3.7.2:";;
+     short | recursive ) echo "Configuration of audacious-plugins 3.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1625,53 +1617,46 @@ Optional Features:
   --enable-qt             Enable Qt support (default=disabled)
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --disable-console       disable game music decoder (console)
-  --disable-qtaudio       disable QtMultimedia output plugin (default=enabled)
+  --enable-cdaudio        enable audio CD support (default=auto)
+  --enable-flac           enable FLAC support (default=yes)
+  --enable-vorbis         enable Ogg Vorbis support (default=yes)
+  --enable-amidiplug      enable MIDI synthesizer (default=auto)
+  --enable-mpg123         enable MP3 support (default=yes)
+  --enable-aac            enable AAC support (default=auto)
+  --enable-wavpack        enable WavPack support (default=yes)
+  --enable-sndfile        enable libsndfile decoder (default=auto)
+  --enable-modplug        enable ModPlug (default=auto)
+  --enable-sid            enable Commodore 64 audio (default=auto)
+  --enable-console        enable Game Music Emu (default=auto)
+  --enable-bs2b           enable BS2B effect (default=auto)
+  --enable-resample       enable sample rate converter (default=auto)
+  --enable-speedpitch     enable speed/pitch effect (default=auto)
+  --enable-soxr           enable SoX resampler (default=auto)
+  --enable-alsa           enable ALSA output (default=auto)
+  --enable-jack           enable JACK output (default=auto)
+  --enable-oss4           enable OSS output (default=auto)
+  --enable-pulse          enable PulseAudio output (default=auto)
+  --enable-sndio          enable Sndio output (default=auto)
+  --enable-cue            enable cue sheet support (default=auto)
+  --enable-neon           enable HTTP/HTTPS transport (default=yes)
+  --enable-mms            enable MMS transport (default=auto)
+  --enable-gnomeshortcuts enable GNOME shortcuts (default=auto)
+  --enable-notify         enable libnotify OSD (default=auto)
+  --enable-lirc           enable LIRC support (default=auto)
+  --enable-mpris2         enable MPRIS 2 server (default=auto)
+  --enable-songchange     enable song change plugin (default=auto)
+  --enable-scrobbler2     enable Scrobbler 2 (default=auto)
+  --enable-glspectrum     enable OpenGL spectrum analyzer (default=auto)
+  --enable-hotkey         enable global hotkeys (X11) (default=auto)
+  --enable-aosd           enable X11 OSD (default=auto)
+  --enable-ampache        enable Ampache browser (default=auto)
+  --enable-qtaudio        enable QtMultimedia output (default=auto)
+  --enable-qtglspectrum   enable Qt OpenGL spectrum analyzer (default=auto)
   --disable-coreaudio     disable CoreAudio output plugin (default=enabled)
-  --disable-pulse         disable PulseAudio output plugin (default=enabled)
-  --disable-mp3           disable MP3 support (default=enabled)
-  --disable-hotkey        disable global hotkey plugin (default=enabled)
-  --disable-gnomeshortcuts
-                          disable gnome shortcuts (default=enabled)
-  --disable-lirc          disable LIRC support (default=enabled)
-  --disable-songchange    disable song change plugin
-  --disable-aosd          disable Audacious OSD plugin (default=enabled)
-  --disable-aosd-xcomp    disable Audacious OSD X Composite Support
-                          (default=enabled)
-  --disable-notify        disable notify plugin (default=enabled)
-  --disable-mpris2        disable MPRIS 2 support (default=auto)
-  --disable-vorbis        disable Ogg Vorbis support (default=enabled)
-  --disable-flacng        disable FLAC support (default=enabled)
-  --disable-wavpack       disable WavPack input plugin (default=enabled)
-  --disable-aac           disable AAC support (default=enabled)
-  --disable-sndfile       disable sndfile extensions. [default=enabled]
-  --disable-modplug       disable ModPlug plugin (default=enabled)
-  --disable-jack          disable JACK output plugin (default=enabled)
-  --disable-sid           disable SID input plugin (default=enabled)
-  --disable-oss4          disable OSS4 output plugin
-  --disable-alsa          disable ALSA output plugin
-  --disable-sdlout        disable SDL output plugin
-  --disable-sndio         disable sndio output plugin (default=enabled)
-  --disable-amidiplug     disable amidi-plug input plugin
-  --disable-cdaudio       disable cdaudio-ng input plugin (default=enabled)
-  --disable-scrobbler2    disable Scrobbler 2 plugin (default=enabled)
-  --disable-neon          disable neon HTTP support (default=enabled)
-  --disable-mms           disable mms support. (default=enabled)
-  --disable-cue           disable cue support. (default=enabled)
+  --enable-sdlout         enable SDL Output (default=auto)
   --disable-filewriter    disable FileWriter output plugin (default=enabled)
   --disable-filewriter_mp3
                           disable FileWriter MP3 output part (default=enabled)
-  --disable-filewriter_flac
-                          disable FileWriter FLAC output part
-                          (default=enabled)
-  --disable-bs2b          disable BS2B effect plugin (default=enabled)
-  --disable-resample      disable resample effect plugin (default=enabled)
-  --disable-speedpitch    disable Speed and Pitch effect plugin
-  --disable-soxr          disable SoX Resampler effect plugin
-                          (default=enabled)
-  --enable-glspectrum     enable OpenGL Spectrum Analyzer (default=auto)
-  --disable-qtglspectrum  disable Qt OpenGL Spectrum Analyzer
-                          (default=enabled)
   --enable-mac-media-keys enable Mac Media Keys
 
 Optional Packages:
@@ -1687,8 +1672,7 @@ Optional Packages:
   --with-ffmpeg=ffmpeg,libav,none
                           choose between FFmpeg, libav, or neither
                           (default=ffmpeg)
-  --with-libsdl=VER       select which SDL version to use. Set VER to 1 for
-                          libsdl1, to 2 for libsdl2. [default=check]
+  --with-libsdl=1,2       select which SDL version to use (default=auto)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1722,6 +1706,9 @@ Some influential environment variables:
   GTK_LIBS    linker flags for GTK, overriding pkg-config
   GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
   GIO_LIBS    linker flags for GIO, overriding pkg-config
+  QTCORE_CFLAGS
+              C compiler flags for QTCORE, overriding pkg-config
+  QTCORE_LIBS linker flags for QTCORE, overriding pkg-config
   QT_CFLAGS   C compiler flags for QT, overriding pkg-config
   QT_LIBS     linker flags for QT, overriding pkg-config
   AUDACIOUS_CFLAGS
@@ -1730,39 +1717,22 @@ Some influential environment variables:
               linker flags for AUDACIOUS, overriding pkg-config
   XML_CFLAGS  C compiler flags for XML, overriding pkg-config
   XML_LIBS    linker flags for XML, overriding pkg-config
-  QTMULTIMEDIA_CFLAGS
-              C compiler flags for QTMULTIMEDIA, overriding pkg-config
-  QTMULTIMEDIA_LIBS
-              linker flags for QTMULTIMEDIA, overriding pkg-config
-  PULSE_CFLAGS
-              C compiler flags for PULSE, overriding pkg-config
-  PULSE_LIBS  linker flags for PULSE, overriding pkg-config
-  MPG123_CFLAGS
-              C compiler flags for MPG123, overriding pkg-config
-  MPG123_LIBS linker flags for MPG123, overriding pkg-config
-  GDKX11_CFLAGS
-              C compiler flags for GDKX11, overriding pkg-config
-  GDKX11_LIBS linker flags for GDKX11, overriding pkg-config
-  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
-  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
-  XRENDER_CFLAGS
-              C compiler flags for XRENDER, overriding pkg-config
-  XRENDER_LIBS
-              linker flags for XRENDER, overriding pkg-config
-  XCOMPOSITE_CFLAGS
-              C compiler flags for XCOMPOSITE, overriding pkg-config
-  XCOMPOSITE_LIBS
-              linker flags for XCOMPOSITE, overriding pkg-config
-  NOTIFY_CFLAGS
-              C compiler flags for NOTIFY, overriding pkg-config
-  NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
-  VORBIS_CFLAGS
-              C compiler flags for VORBIS, overriding pkg-config
-  VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
+  CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
+  CDIO_LIBS   linker flags for CDIO, overriding pkg-config
   LIBFLAC_CFLAGS
               C compiler flags for LIBFLAC, overriding pkg-config
   LIBFLAC_LIBS
               linker flags for LIBFLAC, overriding pkg-config
+  VORBIS_CFLAGS
+              C compiler flags for VORBIS, overriding pkg-config
+  VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
+  FLUIDSYNTH_CFLAGS
+              C compiler flags for FLUIDSYNTH, overriding pkg-config
+  FLUIDSYNTH_LIBS
+              linker flags for FLUIDSYNTH, overriding pkg-config
+  MPG123_CFLAGS
+              C compiler flags for MPG123, overriding pkg-config
+  MPG123_LIBS linker flags for MPG123, overriding pkg-config
   WAVPACK_CFLAGS
               C compiler flags for WAVPACK, overriding pkg-config
   WAVPACK_LIBS
@@ -1775,37 +1745,10 @@ Some influential environment variables:
               C compiler flags for MODPLUG, overriding pkg-config
   MODPLUG_LIBS
               linker flags for MODPLUG, overriding pkg-config
-  FFMPEG_CFLAGS
-              C compiler flags for FFMPEG, overriding pkg-config
-  FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
-  JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
-  JACK_LIBS   linker flags for JACK, overriding pkg-config
   SIDPLAYFP_CFLAGS
               C compiler flags for SIDPLAYFP, overriding pkg-config
   SIDPLAYFP_LIBS
               linker flags for SIDPLAYFP, overriding pkg-config
-  ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
-  ALSA_LIBS   linker flags for ALSA, overriding pkg-config
-  SDL_CFLAGS  C compiler flags for SDL, overriding pkg-config
-  SDL_LIBS    linker flags for SDL, overriding pkg-config
-  FLUIDSYNTH_CFLAGS
-              C compiler flags for FLUIDSYNTH, overriding pkg-config
-  FLUIDSYNTH_LIBS
-              linker flags for FLUIDSYNTH, overriding pkg-config
-  CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
-  CDIO_LIBS   linker flags for CDIO, overriding pkg-config
-  CDDB_CFLAGS C compiler flags for CDDB, overriding pkg-config
-  CDDB_LIBS   linker flags for CDDB, overriding pkg-config
-  CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
-  CURL_LIBS   linker flags for CURL, overriding pkg-config
-  NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
-  NEON_LIBS   linker flags for NEON, overriding pkg-config
-  MMS_CFLAGS  C compiler flags for MMS, overriding pkg-config
-  MMS_LIBS    linker flags for MMS, overriding pkg-config
-  CUE_CFLAGS  C compiler flags for CUE, overriding pkg-config
-  CUE_LIBS    linker flags for CUE, overriding pkg-config
-  FLAC_CFLAGS C compiler flags for FLAC, overriding pkg-config
-  FLAC_LIBS   linker flags for FLAC, overriding pkg-config
   BS2B_CFLAGS C compiler flags for BS2B, overriding pkg-config
   BS2B_LIBS   linker flags for BS2B, overriding pkg-config
   SAMPLERATE_CFLAGS
@@ -1814,10 +1757,49 @@ Some influential environment variables:
               linker flags for SAMPLERATE, overriding pkg-config
   SOXR_CFLAGS C compiler flags for SOXR, overriding pkg-config
   SOXR_LIBS   linker flags for SOXR, overriding pkg-config
+  ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
+  ALSA_LIBS   linker flags for ALSA, overriding pkg-config
+  JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
+  JACK_LIBS   linker flags for JACK, overriding pkg-config
+  PULSE_CFLAGS
+              C compiler flags for PULSE, overriding pkg-config
+  PULSE_LIBS  linker flags for PULSE, overriding pkg-config
+  CUE_CFLAGS  C compiler flags for CUE, overriding pkg-config
+  CUE_LIBS    linker flags for CUE, overriding pkg-config
+  NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
+  NEON_LIBS   linker flags for NEON, overriding pkg-config
+  MMS_CFLAGS  C compiler flags for MMS, overriding pkg-config
+  MMS_LIBS    linker flags for MMS, overriding pkg-config
+  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+  NOTIFY_CFLAGS
+              C compiler flags for NOTIFY, overriding pkg-config
+  NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
+  CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
+  CURL_LIBS   linker flags for CURL, overriding pkg-config
+  GDKX11_CFLAGS
+              C compiler flags for GDKX11, overriding pkg-config
+  GDKX11_LIBS linker flags for GDKX11, overriding pkg-config
+  X11EXT_CFLAGS
+              C compiler flags for X11EXT, overriding pkg-config
+  X11EXT_LIBS linker flags for X11EXT, overriding pkg-config
+  AMPACHE_CFLAGS
+              C compiler flags for AMPACHE, overriding pkg-config
+  AMPACHE_LIBS
+              linker flags for AMPACHE, overriding pkg-config
+  QTMULTIMEDIA_CFLAGS
+              C compiler flags for QTMULTIMEDIA, overriding pkg-config
+  QTMULTIMEDIA_LIBS
+              linker flags for QTMULTIMEDIA, overriding pkg-config
   QTOPENGL_CFLAGS
               C compiler flags for QTOPENGL, overriding pkg-config
   QTOPENGL_LIBS
               linker flags for QTOPENGL, overriding pkg-config
+  FFMPEG_CFLAGS
+              C compiler flags for FFMPEG, overriding pkg-config
+  FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
+  SDL_CFLAGS  C compiler flags for SDL, overriding pkg-config
+  SDL_LIBS    linker flags for SDL, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1885,7 +1867,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-audacious-plugins configure 3.7.2
+audacious-plugins configure 3.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2373,7 +2355,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 audacious-plugins $as_me 3.7.2, which was
+It was created by audacious-plugins $as_me 3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4912,12 +4894,12 @@ esac
 
 
 if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+    CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
     if test "x$HAVE_DARWIN" = "xyes"; then
-        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
         LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
     else
-        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
+        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
@@ -6146,8 +6128,9 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_AR+:} false; then :
@@ -6186,8 +6169,66 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+fi
+if test -z "$ac_cv_path_AR"; then
+  ac_pt_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_AR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_AR="$ac_pt_AR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_AR="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_AR=$ac_cv_path_ac_pt_AR
+if test -n "$ac_pt_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_AR" >&5
+$as_echo "$ac_pt_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_pt_AR
+  fi
+else
+  AR="$ac_cv_path_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_RANLIB+:} false; then :
@@ -6226,8 +6267,66 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
+fi
+if test -z "$ac_cv_path_RANLIB"; then
+  ac_pt_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_RANLIB in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_RANLIB="$ac_pt_RANLIB" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_RANLIB="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_RANLIB=$ac_cv_path_ac_pt_RANLIB
+if test -n "$ac_pt_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RANLIB" >&5
+$as_echo "$ac_pt_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_RANLIB" = x; then
+    RANLIB=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_pt_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_path_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_WINDRES+:} false; then :
@@ -6266,6 +6365,63 @@ $as_echo "no" >&6; }
 fi
 
 
+fi
+if test -z "$ac_cv_path_WINDRES"; then
+  ac_pt_WINDRES=$WINDRES
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_WINDRES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_WINDRES in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_WINDRES="$ac_pt_WINDRES" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_WINDRES="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
+if test -n "$ac_pt_WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_WINDRES" >&5
+$as_echo "$ac_pt_WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_WINDRES" = x; then
+    WINDRES=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    WINDRES=$ac_pt_WINDRES
+  fi
+else
+  WINDRES="$ac_cv_path_WINDRES"
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
 $as_echo_n "checking for library containing pthread_create... " >&6; }
@@ -6823,6 +6979,97 @@ fi
 if test $USE_QT = yes ; then
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTCORE" >&5
+$as_echo_n "checking for QTCORE... " >&6; }
+
+if test -n "$QTCORE_CFLAGS"; then
+    pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_QTCORE_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core >= 5.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$QTCORE_LIBS"; then
+    pkg_cv_QTCORE_LIBS="$QTCORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs "Qt5Core >= 5.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+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
+	        QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.2" 2>&1`
+        else
+	        QTCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$QTCORE_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (Qt5Core >= 5.2) were not met:
+
+$QTCORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables QTCORE_CFLAGS
+and QTCORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables QTCORE_CFLAGS
+and QTCORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	QTCORE_CFLAGS=$pkg_cv_QTCORE_CFLAGS
+	QTCORE_LIBS=$pkg_cv_QTCORE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5
 $as_echo_n "checking for QT... " >&6; }
 
@@ -6917,6 +7164,7 @@ $as_echo "#define USE_QT 1" >>confdefs.h
 
 
     # needed if Qt was built with -reduce-relocations
+    QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
     QT_CFLAGS="$QT_CFLAGS -fPIC"
 fi
 
@@ -8394,16 +8642,21 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -9156,20 +9409,25 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -9188,20 +9446,25 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -9344,12 +9607,12 @@ if test -n "$AUDACIOUS_CFLAGS"; then
     pkg_cv_AUDACIOUS_CFLAGS="$AUDACIOUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "audacious >= 3.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "audacious >= 3.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.7" 2>/dev/null`
+  pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9361,12 +9624,12 @@ if test -n "$AUDACIOUS_LIBS"; then
     pkg_cv_AUDACIOUS_LIBS="$AUDACIOUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "audacious >= 3.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "audacious >= 3.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.7" 2>/dev/null`
+  pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9387,19 +9650,19 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.7" 2>&1`
+	        AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.8" 2>&1`
         else
-	        AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.7" 2>&1`
+	        AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AUDACIOUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Cannot find Audacious 3.7; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.8; have you installed Audacious yet?" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "Cannot find Audacious 3.7; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.8; have you installed Audacious yet?" "$LINENO" 5
 
 else
 	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
@@ -9626,7 +9889,7 @@ TRANSPORT_PLUGINS="gio"
 
 if test "x$USE_GTK" = "xyes" ; then
     EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
-    GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart delete-files lyricwiki playlist-manager search-tool statusicon"
+    GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart lyricwiki playlist-manager search-tool statusicon"
     GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui skins"
     VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope cairo-spectrum"
 fi
@@ -9636,67 +9899,70 @@ if test "x$USE_QT" = "xyes" ; then
     GENERAL_PLUGINS="$GENERAL_PLUGINS qtui skins-qt"
 fi
 
+USE_GTK_OR_QT=no
 if test "x$USE_GTK" = "xyes" -o "x$USE_QT" = "xyes" ; then
-    GENERAL_PLUGINS="$GENERAL_PLUGINS skins-data"
+    USE_GTK_OR_QT=yes
+    GENERAL_PLUGINS="$GENERAL_PLUGINS delete-files skins-data"
 fi
 
-
-# Check whether --enable-console was given.
-if test "${enable_console+set}" = set; then :
-  enableval=$enable_console; enable_console=$enableval
-else
-  enable_console=auto
+if test $HAVE_MSWINDOWS = yes ; then
+    OUTPUT_PLUGINS="$OUTPUT_PLUGINS waveout"
 fi
 
+check_allowed () {
+    case $1 in
+        glspectrum|hotkey|aosd)
+            plugin_allowed=$USE_GTK
+            if test $plugin_allowed = no -a $2 = yes ; then
+                as_fn_error $? "--enable-$1 cannot be used without --enable-gtk" "$LINENO" 5
+            fi
+            ;;
+        ampache|qtaudio|qtglspectrum)
+            plugin_allowed=$USE_QT
+            if test $plugin_allowed = no -a $2 = yes ; then
+                as_fn_error $? "--enable-$1 cannot be used without --enable-qt" "$LINENO" 5
+            fi
+            ;;
+        *)
+            plugin_allowed=yes
+            ;;
+    esac
+}
 
-have_console=no
-if test "x$enable_console" != "xno"; then
-    for ac_header in zlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB_H 1
-_ACEOF
- have_console=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS console"
-else
-  if test "x$enable_console" = "xyes"; then
-            as_fn_error $? "Cannot find zlib development files, but compilation of game music decoder (console) has been explicitly requested; please install zlib dev files and run configure again" "$LINENO" 5
-         fi
 
-fi
 
-done
 
-fi
 
 
-# Check whether --enable-qtaudio was given.
-if test "${enable_qtaudio+set}" = set; then :
-  enableval=$enable_qtaudio; enable_qtaudio=$enableval
+
+
+
+    # Check whether --enable-cdaudio was given.
+if test "${enable_cdaudio+set}" = set; then :
+  enableval=$enable_cdaudio; enable_cdaudio=$enableval
 else
-  enable_qtaudio=auto
+  enable_cdaudio=auto
 fi
 
 
-have_qtaudio=no
-if test "x$enable_qtaudio" = "xyes" -o \( "x$USE_QT" = "xyes" -a "x$enable_qtaudio" = "xauto" \); then
+    have_cdaudio=no
+    check_allowed cdaudio $enable_cdaudio
+    if test $enable_cdaudio != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTMULTIMEDIA" >&5
-$as_echo_n "checking for QTMULTIMEDIA... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
+$as_echo_n "checking for CDIO... " >&6; }
 
-if test -n "$QTMULTIMEDIA_CFLAGS"; then
-    pkg_cv_QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS"
+if test -n "$CDIO_CFLAGS"; then
+    pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_QTMULTIMEDIA_CFLAGS=`$PKG_CONFIG --cflags "Qt5Multimedia" 2>/dev/null`
+  pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9704,16 +9970,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$QTMULTIMEDIA_LIBS"; then
-    pkg_cv_QTMULTIMEDIA_LIBS="$QTMULTIMEDIA_LIBS"
+if test -n "$CDIO_LIBS"; then
+    pkg_cv_CDIO_LIBS="$CDIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_QTMULTIMEDIA_LIBS=`$PKG_CONFIG --libs "Qt5Multimedia" 2>/dev/null`
+  pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9734,81 +10000,76 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
+	        CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>&1`
         else
-	        QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
+	        CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$QTMULTIMEDIA_PKG_ERRORS" >&5
+	echo "$CDIO_PKG_ERRORS" >&5
+
+
+            if test $enable_cdaudio = yes ; then
+                as_fn_error $? "Missing dependency for audio CD support: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&5
+$as_echo "$as_me: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&2;}
+            fi
 
-	have_qtaudio=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_qtaudio=no
+
+            if test $enable_cdaudio = yes ; then
+                as_fn_error $? "Missing dependency for audio CD support: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&5
+$as_echo "$as_me: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&2;}
+            fi
+
 else
-	QTMULTIMEDIA_CFLAGS=$pkg_cv_QTMULTIMEDIA_CFLAGS
-	QTMULTIMEDIA_LIBS=$pkg_cv_QTMULTIMEDIA_LIBS
+	CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
+	CDIO_LIBS=$pkg_cv_CDIO_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_qtaudio=yes
-fi
-    if test "x$have_qtaudio" = "xyes"; then
-        QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS -fPIC"
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
-    elif test "x$enable_qtaudio" = "xyes"; then
-        as_fn_error $? "QtAudio output plugin requested but QtMultimedia not found!" "$LINENO" 5
-    fi
-fi
-
 
-# Check whether --enable-coreaudio was given.
-if test "${enable_coreaudio+set}" = set; then :
-  enableval=$enable_coreaudio; enable_coreaudio=$enableval
-else
-  enable_coreaudio=auto
+            have_cdaudio=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS cdaudio"
 
 fi
+    fi
 
 
-have_coreaudio=no
-if test "x$enable_coreaudio" != "xno"; then
-    if test "x$HAVE_DARWIN" != "xno"; then
-        have_coreaudio=yes
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS coreaudio"
-    fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** CoreAudio output plugin disabled per user request ***" >&5
-$as_echo "*** CoreAudio output plugin disabled per user request ***" >&6; }
+if test $have_cdaudio = yes ; then
+    GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
 fi
 
 
-# Check whether --enable-pulse was given.
-if test "${enable_pulse+set}" = set; then :
-  enableval=$enable_pulse; enable_pulse=$enableval
+    # Check whether --enable-flac was given.
+if test "${enable_flac+set}" = set; then :
+  enableval=$enable_flac; enable_flac=$enableval
 else
-  enable_pulse=auto
-
+  enable_flac=yes
 fi
 
 
-have_pulse=no
-if test "x$enable_pulse" != "xno"; then
+    have_flac=no
+    check_allowed flac $enable_flac
+    if test $enable_flac != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
-$as_echo_n "checking for PULSE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFLAC" >&5
+$as_echo_n "checking for LIBFLAC... " >&6; }
 
-if test -n "$PULSE_CFLAGS"; then
-    pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
+if test -n "$LIBFLAC_CFLAGS"; then
+    pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.5" 2>/dev/null`
+  pkg_cv_LIBFLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.2.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9816,16 +10077,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$PULSE_LIBS"; then
-    pkg_cv_PULSE_LIBS="$PULSE_LIBS"
+if test -n "$LIBFLAC_LIBS"; then
+    pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.5" 2>/dev/null`
+  pkg_cv_LIBFLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.2.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9846,62 +10107,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
+	        LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
         else
-	        PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
+	        LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$PULSE_PKG_ERRORS" >&5
+	echo "$LIBFLAC_PKG_ERRORS" >&5
 
-	if test "x$enable_pulse" = "xyes"; then
-             as_fn_error $? "Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again" "$LINENO" 5
-          fi
+
+            if test $enable_flac = yes ; then
+                as_fn_error $? "Missing dependency for FLAC support: flac >= 1.2.1" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&5
+$as_echo "$as_me: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_pulse" = "xyes"; then
-             as_fn_error $? "Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again" "$LINENO" 5
-          fi
+
+            if test $enable_flac = yes ; then
+                as_fn_error $? "Missing dependency for FLAC support: flac >= 1.2.1" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&5
+$as_echo "$as_me: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&2;}
+            fi
 
 else
-	PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
-	PULSE_LIBS=$pkg_cv_PULSE_LIBS
+	LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
+	LIBFLAC_LIBS=$pkg_cv_LIBFLAC_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_pulse=yes
-          OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pulseaudio output plugin disabled per user request ***" >&5
-$as_echo "*** pulseaudio output plugin disabled per user request ***" >&6; }
+
+            have_flac=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS flac"
+
 fi
+    fi
+
 
 
-# Check whether --enable-mp3 was given.
-if test "${enable_mp3+set}" = set; then :
-  enableval=$enable_mp3; enable_mp3=$enableval
+    # Check whether --enable-vorbis was given.
+if test "${enable_vorbis+set}" = set; then :
+  enableval=$enable_vorbis; enable_vorbis=$enableval
 else
-  enable_mp3=yes
+  enable_vorbis=yes
 fi
 
 
-if test $enable_mp3 = yes ; then
+    have_vorbis=no
+    check_allowed vorbis $enable_vorbis
+    if test $enable_vorbis != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
-$as_echo_n "checking for MPG123... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
+$as_echo_n "checking for VORBIS... " >&6; }
 
-if test -n "$MPG123_CFLAGS"; then
-    pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
+if test -n "$VORBIS_CFLAGS"; then
+    pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.12" 2>/dev/null`
+  pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9909,16 +10180,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$MPG123_LIBS"; then
-    pkg_cv_MPG123_LIBS="$MPG123_LIBS"
+if test -n "$VORBIS_LIBS"; then
+    pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.12" 2>/dev/null`
+  pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9939,80 +10210,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
         else
-	        MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$MPG123_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libmpg123 >= 1.12) were not met:
+	echo "$VORBIS_PKG_ERRORS" >&5
 
-$MPG123_PKG_ERRORS
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+            if test $enable_vorbis = yes ; then
+                as_fn_error $? "Missing dependency for Ogg Vorbis support: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&5
+$as_echo "$as_me: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&2;}
+            fi
 
-Alternatively, you may set the environment variables MPG123_CFLAGS
-and MPG123_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
 
-Alternatively, you may set the environment variables MPG123_CFLAGS
-and MPG123_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+            if test $enable_vorbis = yes ; then
+                as_fn_error $? "Missing dependency for Ogg Vorbis support: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&5
+$as_echo "$as_me: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&2;}
+            fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 else
-	MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
-	MPG123_LIBS=$pkg_cv_MPG123_LIBS
+	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
+	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-fi
-    INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
-fi
-
-
-# Check whether --enable-hotkey was given.
-if test "${enable_hotkey+set}" = set; then :
-  enableval=$enable_hotkey; enable_hotkey=$enableval
-else
-  enable_hotkey=auto
+            have_vorbis=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
 
 fi
+    fi
 
 
-have_hotkey=no
 
-if test $enable_hotkey = yes -a $USE_GTK != yes ; then
-    as_fn_error $? "--enable-hotkey cannot be used without --enable-gtk" "$LINENO" 5
+    # Check whether --enable-amidiplug was given.
+if test "${enable_amidiplug+set}" = set; then :
+  enableval=$enable_amidiplug; enable_amidiplug=$enableval
+else
+  enable_amidiplug=auto
 fi
 
-if test $enable_hotkey != no -a $USE_GTK = yes ; then
+
+    have_amidiplug=no
+    check_allowed amidiplug $enable_amidiplug
+    if test $enable_amidiplug != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKX11" >&5
-$as_echo_n "checking for GDKX11... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
+$as_echo_n "checking for FLUIDSYNTH... " >&6; }
 
-if test -n "$GDKX11_CFLAGS"; then
-    pkg_cv_GDKX11_CFLAGS="$GDKX11_CFLAGS"
+if test -n "$FLUIDSYNTH_CFLAGS"; then
+    pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GDKX11_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-2.0" 2>/dev/null`
+  pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.0.6" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10020,16 +10283,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$GDKX11_LIBS"; then
-    pkg_cv_GDKX11_LIBS="$GDKX11_LIBS"
+if test -n "$FLUIDSYNTH_LIBS"; then
+    pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GDKX11_LIBS=`$PKG_CONFIG --libs "gdk-x11-2.0" 2>/dev/null`
+  pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.0.6" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10050,61 +10313,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GDKX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-x11-2.0" 2>&1`
+	        FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
         else
-	        GDKX11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-x11-2.0" 2>&1`
+	        FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GDKX11_PKG_ERRORS" >&5
+	echo "$FLUIDSYNTH_PKG_ERRORS" >&5
 
-	if test "x$enable_hotkey" = "xyes"; then
-            as_fn_error $? "Cannot find gdk-x11-2.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-2.0 dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_amidiplug = yes ; then
+                as_fn_error $? "Missing dependency for MIDI synthesizer: fluidsynth >= 1.0.6" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&5
+$as_echo "$as_me: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_hotkey" = "xyes"; then
-            as_fn_error $? "Cannot find gdk-x11-2.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-2.0 dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_amidiplug = yes ; then
+                as_fn_error $? "Missing dependency for MIDI synthesizer: fluidsynth >= 1.0.6" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&5
+$as_echo "$as_me: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&2;}
+            fi
 
 else
-	GDKX11_CFLAGS=$pkg_cv_GDKX11_CFLAGS
-	GDKX11_LIBS=$pkg_cv_GDKX11_LIBS
+	FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS
+	FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_hotkey="yes"
-         GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
-fi
+
+            have_amidiplug=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS amidiplug"
+
 fi
+    fi
 
 
-# Check whether --enable-gnomeshortcuts was given.
-if test "${enable_gnomeshortcuts+set}" = set; then :
-  enableval=$enable_gnomeshortcuts; enable_gnomeshortcuts=$enableval
-else
-  enable_gnomeshortcuts=auto
 
+    # Check whether --enable-mpg123 was given.
+if test "${enable_mpg123+set}" = set; then :
+  enableval=$enable_mpg123; enable_mpg123=$enableval
+else
+  enable_mpg123=yes
 fi
 
 
-have_gnomeshortcuts=no
-if test "x$enable_gnomeshortcuts" != "xno"; then
+    have_mpg123=no
+    check_allowed mpg123 $enable_mpg123
+    if test $enable_mpg123 != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
+$as_echo_n "checking for MPG123... " >&6; }
 
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+if test -n "$MPG123_CFLAGS"; then
+    pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
+  pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10112,16 +10386,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+if test -n "$MPG123_LIBS"; then
+    pkg_cv_MPG123_LIBS="$MPG123_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
+  pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10142,131 +10416,149 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
+	        MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
+	        MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
+	echo "$MPG123_PKG_ERRORS" >&5
 
-	if test "x$enable_gnomeshortcuts" = "xyes"; then
-        as_fn_error $? "Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again" "$LINENO" 5
-      fi
+
+            if test $enable_mpg123 = yes ; then
+                as_fn_error $? "Missing dependency for MP3 support: libmpg123 >= 1.12" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&5
+$as_echo "$as_me: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_gnomeshortcuts" = "xyes"; then
-        as_fn_error $? "Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again" "$LINENO" 5
-      fi
+
+            if test $enable_mpg123 = yes ; then
+                as_fn_error $? "Missing dependency for MP3 support: libmpg123 >= 1.12" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&5
+$as_echo "$as_me: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&2;}
+            fi
 
 else
-	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+	MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
+	MPG123_LIBS=$pkg_cv_MPG123_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_gnomeshortcuts=yes
-      GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Gnome Shortcuts Plugin disabled per user request ***" >&5
-$as_echo "*** Gnome Shortcuts Plugin disabled per user request ***" >&6; }
+
+            have_mpg123=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
+
 fi
+    fi
 
 
-# Check whether --enable-lirc was given.
-if test "${enable_lirc+set}" = set; then :
-  enableval=$enable_lirc; enable_lirc=$enableval
+test_aac () {
+    ac_fn_c_check_header_mongrel "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default"
+if test "x$ac_cv_header_neaacdec_h" = xyes; then :
+  have_aac=yes
 else
-  enable_lirc=auto
+  have_aac=no
 fi
 
 
-have_lirc=no
-if test "x$enable_lirc" != "xno"; then
-    for ac_header in lirc/lirc_client.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_lirc_lirc_client_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIRC_LIRC_CLIENT_H 1
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NeAACDecInit2 in -lfaad" >&5
+$as_echo_n "checking for NeAACDecInit2 in -lfaad... " >&6; }
+if ${ac_cv_lib_faad_NeAACDecInit2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfaad  $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 NeAACDecInit2 ();
+int
+main ()
+{
+return NeAACDecInit2 ();
+  ;
+  return 0;
+}
 _ACEOF
- have_lirc=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_faad_NeAACDecInit2=yes
 else
-  if test "x$enable_lirc" = "xyes"; then
-            as_fn_error $? "Cannot find lirc development files, but compilation of LIRC support has been explicitly requested; please install lirc dev files and run configure again" "$LINENO" 5
-         fi
+  ac_cv_lib_faad_NeAACDecInit2=no
 fi
-
-done
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-
-
-# Check whether --enable-songchange was given.
-if test "${enable_songchange+set}" = set; then :
-  enableval=$enable_songchange; enable_songchange=$enableval
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_NeAACDecInit2" >&5
+$as_echo "$ac_cv_lib_faad_NeAACDecInit2" >&6; }
+if test "x$ac_cv_lib_faad_NeAACDecInit2" = xyes; then :
+  true
 else
-  enable_songchange=auto
+  have_aac=no
 fi
 
+}
 
-have_songchange=no
 
-if test $enable_songchange != no ; then
-    for ac_header in sys/wait.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_wait_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
- have_songchange=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"
+    # Check whether --enable-aac was given.
+if test "${enable_aac+set}" = set; then :
+  enableval=$enable_aac; enable_aac=$enableval
 else
-  if test "x$enable_songchange" = "xyes"; then
-            as_fn_error $? "Cannot find sys/wait.h header, but compilation of song change plugin has been explicitly requested" "$LINENO" 5
-         fi
-
+  enable_aac=auto
 fi
 
-done
 
-fi
+    have_aac=no
+    check_allowed aac $enable_aac
+    if test $enable_aac != no -a $plugin_allowed = yes ; then
+        test_aac
+        if test $have_aac = yes ; then
+            INPUT_PLUGINS="$INPUT_PLUGINS aac"
+        elif test $enable_aac = yes ; then
+            as_fn_error $? "Missing dependency for AAC support" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AAC support disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: AAC support disabled due to missing dependency" >&2;}
+        fi
+    fi
 
 
-# Check whether --enable-aosd was given.
-if test "${enable_aosd+set}" = set; then :
-  enableval=$enable_aosd; enable_aosd=$enableval
-else
-  enable_aosd=auto
 
+    # Check whether --enable-wavpack was given.
+if test "${enable_wavpack+set}" = set; then :
+  enableval=$enable_wavpack; enable_wavpack=$enableval
+else
+  enable_wavpack=yes
 fi
 
 
-have_aosd=no
-
-if test $enable_aosd = yes -a $USE_GTK != yes ; then
-    as_fn_error $? "--enable-aosd cannot be used without --enable-gtk" "$LINENO" 5
-fi
-
-if test $enable_aosd != no -a $USE_GTK = yes ; then
+    have_wavpack=no
+    check_allowed wavpack $enable_wavpack
+    if test $enable_wavpack != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5
-$as_echo_n "checking for XRENDER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAVPACK" >&5
+$as_echo_n "checking for WAVPACK... " >&6; }
 
-if test -n "$XRENDER_CFLAGS"; then
-    pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS"
+if test -n "$WAVPACK_CFLAGS"; then
+    pkg_cv_WAVPACK_CFLAGS="$WAVPACK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null`
+  pkg_cv_WAVPACK_CFLAGS=`$PKG_CONFIG --cflags "wavpack >= 4.31" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10274,16 +10566,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$XRENDER_LIBS"; then
-    pkg_cv_XRENDER_LIBS="$XRENDER_LIBS"
+if test -n "$WAVPACK_LIBS"; then
+    pkg_cv_WAVPACK_LIBS="$WAVPACK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null`
+  pkg_cv_WAVPACK_LIBS=`$PKG_CONFIG --libs "wavpack >= 4.31" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10304,70 +10596,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XRENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrender" 2>&1`
+	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
         else
-	        XRENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrender" 2>&1`
+	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$XRENDER_PKG_ERRORS" >&5
+	echo "$WAVPACK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
-$as_echo "*** X Render extension is required for Audacious OSD plugin ***" >&6; }
+
+            if test $enable_wavpack = yes ; then
+                as_fn_error $? "Missing dependency for WavPack support: wavpack >= 4.31" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&5
+$as_echo "$as_me: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
-$as_echo "*** X Render extension is required for Audacious OSD plugin ***" >&6; }
+
+            if test $enable_wavpack = yes ; then
+                as_fn_error $? "Missing dependency for WavPack support: wavpack >= 4.31" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&5
+$as_echo "$as_me: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&2;}
+            fi
 
 else
-	XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
-	XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
+	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
+	WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_aosd=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
-fi
-
-    if test "x$enable_aosd" = "xyes" -a "x$have_aosd" != "xyes"; then
-        as_fn_error $? "Compilation of OSD plugin has been explicitly requested; please install required dev files and run configure again" "$LINENO" 5
-    fi
-fi
 
-# Check whether --enable-aosd_xcomp was given.
-if test "${enable_aosd_xcomp+set}" = set; then :
-  enableval=$enable_aosd_xcomp; enable_aosd_xcomp=$enableval
-else
-  enable_aosd_xcomp=auto
+            have_wavpack=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
 
 fi
+    fi
 
 
-if test "x$have_aosd" != "xyes"; then
-    if test "x$enable_aosd_xcomp" = "xyes"; then
-        as_fn_error $? "Cannot enable X Composite support for Audacious OSD plugin which is disabled" "$LINENO" 5
-    else
-        enable_aosd_xcomp=no
-    fi
+
+    # Check whether --enable-sndfile was given.
+if test "${enable_sndfile+set}" = set; then :
+  enableval=$enable_sndfile; enable_sndfile=$enableval
+else
+  enable_sndfile=auto
 fi
 
-have_aosd_xcomp=no
-if test "x$enable_aosd_xcomp" != "xno"; then
+
+    have_sndfile=no
+    check_allowed sndfile $enable_sndfile
+    if test $enable_sndfile != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPOSITE" >&5
-$as_echo_n "checking for XCOMPOSITE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
+$as_echo_n "checking for SNDFILE... " >&6; }
 
-if test -n "$XCOMPOSITE_CFLAGS"; then
-    pkg_cv_XCOMPOSITE_CFLAGS="$XCOMPOSITE_CFLAGS"
+if test -n "$SNDFILE_CFLAGS"; then
+    pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xcomposite") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XCOMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "xcomposite" 2>/dev/null`
+  pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 0.19" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10375,16 +10669,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$XCOMPOSITE_LIBS"; then
-    pkg_cv_XCOMPOSITE_LIBS="$XCOMPOSITE_LIBS"
+if test -n "$SNDFILE_LIBS"; then
+    pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xcomposite") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XCOMPOSITE_LIBS=`$PKG_CONFIG --libs "xcomposite" 2>/dev/null`
+  pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 0.19" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10405,67 +10699,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite" 2>&1`
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
         else
-	        XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite" 2>&1`
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$XCOMPOSITE_PKG_ERRORS" >&5
+	echo "$SNDFILE_PKG_ERRORS" >&5
 
-	if test "x$enable_aosd_xcomp" = "xyes"; then
-            as_fn_error $? "Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_sndfile = yes ; then
+                as_fn_error $? "Missing dependency for libsndfile decoder: sndfile >= 0.19" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&5
+$as_echo "$as_me: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_aosd_xcomp" = "xyes"; then
-            as_fn_error $? "Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_sndfile = yes ; then
+                as_fn_error $? "Missing dependency for libsndfile decoder: sndfile >= 0.19" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&5
+$as_echo "$as_me: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&2;}
+            fi
 
 else
-	XCOMPOSITE_CFLAGS=$pkg_cv_XCOMPOSITE_CFLAGS
-	XCOMPOSITE_LIBS=$pkg_cv_XCOMPOSITE_LIBS
+	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
+	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_aosd_xcomp=yes
 
-$as_echo "#define HAVE_XCOMPOSITE /**/" >>confdefs.h
+            have_sndfile=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
 
 fi
-fi
+    fi
 
 
-# Check whether --enable-notify was given.
-if test "${enable_notify+set}" = set; then :
-  enableval=$enable_notify; enable_notify=$enableval
+
+    # Check whether --enable-modplug was given.
+if test "${enable_modplug+set}" = set; then :
+  enableval=$enable_modplug; enable_modplug=$enableval
 else
-  enable_notify=auto
+  enable_modplug=auto
 fi
 
 
-have_notify=no
-
-if test $enable_notify = yes -a $USE_GTK != yes ; then
-    as_fn_error $? "--enable-notify cannot be used without --enable-gtk" "$LINENO" 5
-fi
-
-if test $enable_notify != no -a $USE_GTK = yes ; then
+    have_modplug=no
+    check_allowed modplug $enable_modplug
+    if test $enable_modplug != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
-$as_echo_n "checking for NOTIFY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODPLUG" >&5
+$as_echo_n "checking for MODPLUG... " >&6; }
 
-if test -n "$NOTIFY_CFLAGS"; then
-    pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
+if test -n "$MODPLUG_CFLAGS"; then
+    pkg_cv_MODPLUG_CFLAGS="$MODPLUG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7" 2>/dev/null`
+  pkg_cv_MODPLUG_CFLAGS=`$PKG_CONFIG --cflags "libmodplug" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10473,16 +10772,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$NOTIFY_LIBS"; then
-    pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
+if test -n "$MODPLUG_LIBS"; then
+    pkg_cv_MODPLUG_LIBS="$MODPLUG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7" 2>/dev/null`
+  pkg_cv_MODPLUG_LIBS=`$PKG_CONFIG --libs "libmodplug" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10503,117 +10802,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= 0.7" 2>&1`
+	        MODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug" 2>&1`
         else
-	        NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= 0.7" 2>&1`
+	        MODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$NOTIFY_PKG_ERRORS" >&5
+	echo "$MODPLUG_PKG_ERRORS" >&5
 
-	if test "x$enable_notify" = "xyes"; then
-            as_fn_error $? "Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_modplug = yes ; then
+                as_fn_error $? "Missing dependency for ModPlug: libmodplug" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&5
+$as_echo "$as_me: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_notify" = "xyes"; then
-            as_fn_error $? "Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_modplug = yes ; then
+                as_fn_error $? "Missing dependency for ModPlug: libmodplug" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&5
+$as_echo "$as_me: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&2;}
+            fi
 
 else
-	NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS
-	NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS
+	MODPLUG_CFLAGS=$pkg_cv_MODPLUG_CFLAGS
+	MODPLUG_LIBS=$pkg_cv_MODPLUG_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_notify=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
-fi
-fi
-
 
-# Check whether --enable-mpris2 was given.
-if test "${enable_mpris2+set}" = set; then :
-  enableval=$enable_mpris2; enable_mpris2=$enableval
-else
-  enable_mpris2=auto
-fi
-
-
-if test $enable_mpris2 = no ; then
-    have_mpris2=no
-else
-    # Extract the first word of "gdbus-codegen", so it can be a program name with args.
-set dummy gdbus-codegen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_have_mpris2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$have_mpris2"; then
-  ac_cv_prog_have_mpris2="$have_mpris2" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_have_mpris2="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+            have_modplug=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS modplug"
 
-  test -z "$ac_cv_prog_have_mpris2" && ac_cv_prog_have_mpris2="no"
-fi
 fi
-have_mpris2=$ac_cv_prog_have_mpris2
-if test -n "$have_mpris2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mpris2" >&5
-$as_echo "$have_mpris2" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test $have_mpris2 = yes ; then
-        GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
-    elif test $enable_mpris2 = yes ; then
-        as_fn_error $? "MPRIS 2 plugin could not be enabled; check config.log" "$LINENO" 5
     fi
-fi
 
 
 
-# Check whether --enable-vorbis was given.
-if test "${enable_vorbis+set}" = set; then :
-  enableval=$enable_vorbis; enable_vorbis=$enableval
+    # Check whether --enable-sid was given.
+if test "${enable_sid+set}" = set; then :
+  enableval=$enable_sid; enable_sid=$enableval
 else
-  enable_vorbis=yes
+  enable_sid=auto
 fi
 
 
-if test $enable_vorbis = yes ; then
+    have_sid=no
+    check_allowed sid $enable_sid
+    if test $enable_sid != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
-$as_echo_n "checking for VORBIS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIDPLAYFP" >&5
+$as_echo_n "checking for SIDPLAYFP... " >&6; }
 
-if test -n "$VORBIS_CFLAGS"; then
-    pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+if test -n "$SIDPLAYFP_CFLAGS"; then
+    pkg_cv_SIDPLAYFP_CFLAGS="$SIDPLAYFP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
+  pkg_cv_SIDPLAYFP_CFLAGS=`$PKG_CONFIG --cflags "libsidplayfp >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10621,16 +10875,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$VORBIS_LIBS"; then
-    pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+if test -n "$SIDPLAYFP_LIBS"; then
+    pkg_cv_SIDPLAYFP_LIBS="$SIDPLAYFP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
+  pkg_cv_SIDPLAYFP_LIBS=`$PKG_CONFIG --libs "libsidplayfp >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10651,179 +10905,113 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
+	        SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
         else
-	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
+	        SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$VORBIS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0) were not met:
+	echo "$SIDPLAYFP_PKG_ERRORS" >&5
 
-$VORBIS_PKG_ERRORS
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+            if test $enable_sid = yes ; then
+                as_fn_error $? "Missing dependency for Commodore 64 audio: libsidplayfp >= 1.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 1.0" >&5
+$as_echo "$as_me: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 1.0" >&2;}
+            fi
 
-Alternatively, you may set the environment variables VORBIS_CFLAGS
-and VORBIS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
 
-Alternatively, you may set the environment variables VORBIS_CFLAGS
-and VORBIS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+            if test $enable_sid = yes ; then
+                as_fn_error $? "Missing dependency for Commodore 64 audio: libsidplayfp >= 1.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 1.0" >&5
+$as_echo "$as_me: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 1.0" >&2;}
+            fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 else
-	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
-	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
+	SIDPLAYFP_CFLAGS=$pkg_cv_SIDPLAYFP_CFLAGS
+	SIDPLAYFP_LIBS=$pkg_cv_SIDPLAYFP_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+            have_sid=yes
+            INPUT_PLUGINS="$INPUT_PLUGINS sid"
+
 fi
-    INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
-fi
+    fi
 
 
-# Check whether --enable-flacng was given.
-if test "${enable_flacng+set}" = set; then :
-  enableval=$enable_flacng; enable_flacng=$enableval
+test_console () {
+    for ac_header in zlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+ have_console=yes
 else
-  enable_flacng=yes
+  have_console=no
 fi
 
+done
 
-if test $enable_flacng = yes ; then
+}
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFLAC" >&5
-$as_echo_n "checking for LIBFLAC... " >&6; }
 
-if test -n "$LIBFLAC_CFLAGS"; then
-    pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBFLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBFLAC_LIBS"; then
-    pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBFLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+    # Check whether --enable-console was given.
+if test "${enable_console+set}" = set; then :
+  enableval=$enable_console; enable_console=$enableval
 else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
+  enable_console=auto
 fi
 
 
-
-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
-	        LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
+    have_console=no
+    check_allowed console $enable_console
+    if test $enable_console != no -a $plugin_allowed = yes ; then
+        test_console
+        if test $have_console = yes ; then
+            INPUT_PLUGINS="$INPUT_PLUGINS console"
+        elif test $enable_console = yes ; then
+            as_fn_error $? "Missing dependency for Game Music Emu" "$LINENO" 5
         else
-	        LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Game Music Emu disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: Game Music Emu disabled due to missing dependency" >&2;}
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBFLAC_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (flac >= 1.2.1) were not met:
-
-$LIBFLAC_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBFLAC_CFLAGS
-and LIBFLAC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBFLAC_CFLAGS
-and LIBFLAC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
-	LIBFLAC_LIBS=$pkg_cv_LIBFLAC_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    fi
 
-fi
-    INPUT_PLUGINS="$INPUT_PLUGINS flacng"
-fi
 
 
-# Check whether --enable-wavpack was given.
-if test "${enable_wavpack+set}" = set; then :
-  enableval=$enable_wavpack; enable_wavpack=$enableval
+    # Check whether --enable-bs2b was given.
+if test "${enable_bs2b+set}" = set; then :
+  enableval=$enable_bs2b; enable_bs2b=$enableval
 else
-  enable_wavpack=auto
-
+  enable_bs2b=auto
 fi
 
 
-have_wavpack=no
-if test "x$enable_wavpack" != "xno"; then
+    have_bs2b=no
+    check_allowed bs2b $enable_bs2b
+    if test $enable_bs2b != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAVPACK" >&5
-$as_echo_n "checking for WAVPACK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BS2B" >&5
+$as_echo_n "checking for BS2B... " >&6; }
 
-if test -n "$WAVPACK_CFLAGS"; then
-    pkg_cv_WAVPACK_CFLAGS="$WAVPACK_CFLAGS"
+if test -n "$BS2B_CFLAGS"; then
+    pkg_cv_BS2B_CFLAGS="$BS2B_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAVPACK_CFLAGS=`$PKG_CONFIG --cflags "wavpack >= 4.31" 2>/dev/null`
+  pkg_cv_BS2B_CFLAGS=`$PKG_CONFIG --cflags "libbs2b >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10831,16 +11019,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$WAVPACK_LIBS"; then
-    pkg_cv_WAVPACK_LIBS="$WAVPACK_LIBS"
+if test -n "$BS2B_LIBS"; then
+    pkg_cv_BS2B_LIBS="$BS2B_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAVPACK_LIBS=`$PKG_CONFIG --libs "wavpack >= 4.31" 2>/dev/null`
+  pkg_cv_BS2B_LIBS=`$PKG_CONFIG --libs "libbs2b >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10861,137 +11049,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
+	        BS2B_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
         else
-	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
+	        BS2B_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$WAVPACK_PKG_ERRORS" >&5
+	echo "$BS2B_PKG_ERRORS" >&5
 
-	if test "x$enable_wavpack" = "xyes"; then
-            as_fn_error $? "Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_bs2b = yes ; then
+                as_fn_error $? "Missing dependency for BS2B effect: libbs2b >= 3.0.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&5
+$as_echo "$as_me: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_wavpack" = "xyes"; then
-            as_fn_error $? "Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_bs2b = yes ; then
+                as_fn_error $? "Missing dependency for BS2B effect: libbs2b >= 3.0.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&5
+$as_echo "$as_me: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&2;}
+            fi
 
 else
-	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
-	WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
+	BS2B_CFLAGS=$pkg_cv_BS2B_CFLAGS
+	BS2B_LIBS=$pkg_cv_BS2B_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_wavpack=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** WavPack plugin disabled per user request ***" >&5
-$as_echo "*** WavPack plugin disabled per user request ***" >&6; }
-fi
 
+            have_bs2b=yes
+            EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
 
-# Check whether --enable-aac was given.
-if test "${enable_aac+set}" = set; then :
-  enableval=$enable_aac; enable_aac=$enableval
-else
-  enable_aac=yes
-fi
-
-
-if test $enable_aac = yes ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default"
-if test "x$ac_cv_header_neaacdec_h" = xyes; then :
-  have_aac=yes
-else
-  have_aac=no
 fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NeAACDecInit2 in -lfaad" >&5
-$as_echo_n "checking for NeAACDecInit2 in -lfaad... " >&6; }
-if ${ac_cv_lib_faad_NeAACDecInit2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfaad  $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 NeAACDecInit2 ();
-int
-main ()
-{
-return NeAACDecInit2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_faad_NeAACDecInit2=yes
-else
-  ac_cv_lib_faad_NeAACDecInit2=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_faad_NeAACDecInit2" >&5
-$as_echo "$ac_cv_lib_faad_NeAACDecInit2" >&6; }
-if test "x$ac_cv_lib_faad_NeAACDecInit2" = xyes; then :
-  have_aac=$have_aac
-else
-  have_aac=no
-fi
-
-
-    if test $have_aac != yes ; then
-        as_fn_error $? "Please install libfaad, or use --disable-aac to disable AAC support." "$LINENO" 5
     fi
 
-    FAAD_CFLAGS=
-    FAAD_LIBS="-lfaad"
-
 
 
-    INPUT_PLUGINS="$INPUT_PLUGINS aac-raw"
-fi
-
-
-# Check whether --enable-sndfile was given.
-if test "${enable_sndfile+set}" = set; then :
-  enableval=$enable_sndfile; enable_sndfile=$enableval
+    # Check whether --enable-resample was given.
+if test "${enable_resample+set}" = set; then :
+  enableval=$enable_resample; enable_resample=$enableval
 else
-  enable_sndfile=auto
-
+  enable_resample=auto
 fi
 
 
-have_sndfile=no
-if test "x$enable_sndfile" != "xno"; then
+    have_resample=no
+    check_allowed resample $enable_resample
+    if test $enable_resample != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
-$as_echo_n "checking for SNDFILE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
+$as_echo_n "checking for SAMPLERATE... " >&6; }
 
-if test -n "$SNDFILE_CFLAGS"; then
-    pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
+if test -n "$SAMPLERATE_CFLAGS"; then
+    pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 0.19" 2>/dev/null`
+  pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10999,16 +11122,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SNDFILE_LIBS"; then
-    pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
+if test -n "$SAMPLERATE_LIBS"; then
+    pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 0.19" 2>/dev/null`
+  pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11029,64 +11152,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
+	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
         else
-	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
+	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SNDFILE_PKG_ERRORS" >&5
+	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	if test "x$enable_sndfile" = "xyes"; then
-            as_fn_error $? "Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_resample = yes ; then
+                as_fn_error $? "Missing dependency for sample rate converter: samplerate" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&5
+$as_echo "$as_me: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_sndfile" = "xyes"; then
-            as_fn_error $? "Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_resample = yes ; then
+                as_fn_error $? "Missing dependency for sample rate converter: samplerate" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&5
+$as_echo "$as_me: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&2;}
+            fi
 
 else
-	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
-	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
+	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
+	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_sndfile=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libsndfile extensions disabled per user request ***" >&5
-$as_echo "*** libsndfile extensions disabled per user request ***" >&6; }
+
+            have_resample=yes
+            EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
+
 fi
+    fi
 
 
-# Check whether --enable-modplug was given.
-if test "${enable_modplug+set}" = set; then :
-  enableval=$enable_modplug; enable_modplug=$enableval
-else
-  enable_modplug=auto
 
+    # Check whether --enable-speedpitch was given.
+if test "${enable_speedpitch+set}" = set; then :
+  enableval=$enable_speedpitch; enable_speedpitch=$enableval
+else
+  enable_speedpitch=auto
 fi
 
 
-have_modplug=no
-if test "x$enable_modplug" != "xno"; then
+    have_speedpitch=no
+    check_allowed speedpitch $enable_speedpitch
+    if test $enable_speedpitch != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODPLUG" >&5
-$as_echo_n "checking for MODPLUG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
+$as_echo_n "checking for SAMPLERATE... " >&6; }
 
-if test -n "$MODPLUG_CFLAGS"; then
-    pkg_cv_MODPLUG_CFLAGS="$MODPLUG_CFLAGS"
+if test -n "$SAMPLERATE_CFLAGS"; then
+    pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MODPLUG_CFLAGS=`$PKG_CONFIG --cflags "libmodplug" 2>/dev/null`
+  pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11094,16 +11225,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$MODPLUG_LIBS"; then
-    pkg_cv_MODPLUG_LIBS="$MODPLUG_LIBS"
+if test -n "$SAMPLERATE_LIBS"; then
+    pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MODPLUG_LIBS=`$PKG_CONFIG --libs "libmodplug" 2>/dev/null`
+  pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11124,60 +11255,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug" 2>&1`
+	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
         else
-	        MODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug" 2>&1`
+	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$MODPLUG_PKG_ERRORS" >&5
+	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	if test "x$enable_modplug" = "xyes"; then
-         as_fn_error $? "Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again" "$LINENO" 5
-      fi
+
+            if test $enable_speedpitch = yes ; then
+                as_fn_error $? "Missing dependency for speed/pitch effect: samplerate" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&5
+$as_echo "$as_me: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_modplug" = "xyes"; then
-         as_fn_error $? "Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again" "$LINENO" 5
-      fi
+
+            if test $enable_speedpitch = yes ; then
+                as_fn_error $? "Missing dependency for speed/pitch effect: samplerate" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&5
+$as_echo "$as_me: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&2;}
+            fi
 
 else
-	MODPLUG_CFLAGS=$pkg_cv_MODPLUG_CFLAGS
-	MODPLUG_LIBS=$pkg_cv_MODPLUG_LIBS
+	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
+	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	INPUT_PLUGINS="$INPUT_PLUGINS modplug"
-      have_modplug=yes
-fi
+
+            have_speedpitch=yes
+            EFFECT_PLUGINS="$EFFECT_PLUGINS speedpitch"
+
 fi
+    fi
 
 
 
-# Check whether --with-ffmpeg was given.
-if test "${with_ffmpeg+set}" = set; then :
-  withval=$with_ffmpeg; ffmpeg_variant=$withval
+    # Check whether --enable-soxr was given.
+if test "${enable_soxr+set}" = set; then :
+  enableval=$enable_soxr; enable_soxr=$enableval
 else
-  ffmpeg_variant=ffmpeg
+  enable_soxr=auto
 fi
 
 
-if test $ffmpeg_variant = ffmpeg ; then
+    have_soxr=no
+    check_allowed soxr $enable_soxr
+    if test $enable_soxr != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5
+$as_echo_n "checking for SOXR... " >&6; }
 
-if test -n "$FFMPEG_CFLAGS"; then
-    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+if test -n "$SOXR_CFLAGS"; then
+    pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>/dev/null`
+  pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11185,16 +11328,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$FFMPEG_LIBS"; then
-    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+if test -n "$SOXR_LIBS"; then
+    pkg_cv_SOXR_LIBS="$SOXR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>/dev/null`
+  pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11215,44 +11358,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>&1`
+	        SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr" 2>&1`
         else
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>&1`
+	        SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$FFMPEG_PKG_ERRORS" >&5
+	echo "$SOXR_PKG_ERRORS" >&5
+
+
+            if test $enable_soxr = yes ; then
+                as_fn_error $? "Missing dependency for SoX resampler: soxr" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SoX resampler disabled due to missing dependency: soxr" >&5
+$as_echo "$as_me: WARNING: SoX resampler disabled due to missing dependency: soxr" >&2;}
+            fi
 
-	as_fn_error $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$LINENO" 5
+
+            if test $enable_soxr = yes ; then
+                as_fn_error $? "Missing dependency for SoX resampler: soxr" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SoX resampler disabled due to missing dependency: soxr" >&5
+$as_echo "$as_me: WARNING: SoX resampler disabled due to missing dependency: soxr" >&2;}
+            fi
+
 else
-	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
-	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
+	SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS
+	SOXR_LIBS=$pkg_cv_SOXR_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 
-$as_echo "#define HAVE_FFMPEG 1" >>confdefs.h
+            have_soxr=yes
+            EFFECT_PLUGINS="$EFFECT_PLUGINS soxr"
 
 fi
-elif test $ffmpeg_variant = libav ; then
+    fi
+
+
+
+    # Check whether --enable-alsa was given.
+if test "${enable_alsa+set}" = set; then :
+  enableval=$enable_alsa; enable_alsa=$enableval
+else
+  enable_alsa=auto
+fi
+
+
+    have_alsa=no
+    check_allowed alsa $enable_alsa
+    if test $enable_alsa != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
+$as_echo_n "checking for ALSA... " >&6; }
 
-if test -n "$FFMPEG_CFLAGS"; then
-    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+if test -n "$ALSA_CFLAGS"; then
+    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>/dev/null`
+  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.16" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11260,16 +11431,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$FFMPEG_LIBS"; then
-    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+if test -n "$ALSA_LIBS"; then
+    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>/dev/null`
+  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.16" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11290,41 +11461,46 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>&1`
+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
         else
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>&1`
+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$FFMPEG_PKG_ERRORS" >&5
+	echo "$ALSA_PKG_ERRORS" >&5
+
+
+            if test $enable_alsa = yes ; then
+                as_fn_error $? "Missing dependency for ALSA output: alsa >= 1.0.16" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&5
+$as_echo "$as_me: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&2;}
+            fi
 
-	as_fn_error $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0)." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0)." "$LINENO" 5
+
+            if test $enable_alsa = yes ; then
+                as_fn_error $? "Missing dependency for ALSA output: alsa >= 1.0.16" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&5
+$as_echo "$as_me: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&2;}
+            fi
+
 else
-	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
-	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
+	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+	ALSA_LIBS=$pkg_cv_ALSA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
-
-$as_echo "#define HAVE_LIBAV 1" >>confdefs.h
-
-fi
-fi
 
+            have_alsa=yes
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
 
-# Check whether --enable-jack was given.
-if test "${enable_jack+set}" = set; then :
-  enableval=$enable_jack; enable_jack=$enableval
-else
-  enable_jack=auto
 fi
+    fi
 
 
-have_jack=no
-if test "x$enable_jack" != "xno"; then
+test_jack () {
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
@@ -11385,6 +11561,7 @@ fi
 	echo "$JACK_PKG_ERRORS" >&5
 
 
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
 $as_echo_n "checking for JACK... " >&6; }
@@ -11460,6 +11637,7 @@ elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
 $as_echo_n "checking for JACK... " >&6; }
@@ -11538,126 +11716,43 @@ else
 $as_echo "yes" >&6; }
 	have_jack=yes
 fi
+}
 
-    if test "x$have_jack" = "xyes"; then
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack-ng"
-    elif test "x$enable_jack" = "xyes"; then
-        as_fn_error $? "Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) development files, but compilation of JACK output plugin has been explicitly requested; please install JACK dev files and run configure again" "$LINENO" 5
-    fi
-fi
-
-# Check whether --enable-sid was given.
-if test "${enable_sid+set}" = set; then :
-  enableval=$enable_sid; enable_sid=$enableval
-else
-  enable_sid=auto
-fi
-
-
-have_sidplay=no
-if test "x$enable_sid" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIDPLAYFP" >&5
-$as_echo_n "checking for SIDPLAYFP... " >&6; }
 
-if test -n "$SIDPLAYFP_CFLAGS"; then
-    pkg_cv_SIDPLAYFP_CFLAGS="$SIDPLAYFP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SIDPLAYFP_CFLAGS=`$PKG_CONFIG --cflags "libsidplayfp >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SIDPLAYFP_LIBS"; then
-    pkg_cv_SIDPLAYFP_LIBS="$SIDPLAYFP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SIDPLAYFP_LIBS=`$PKG_CONFIG --libs "libsidplayfp >= 1.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+    # Check whether --enable-jack was given.
+if test "${enable_jack+set}" = set; then :
+  enableval=$enable_jack; enable_jack=$enableval
 else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
+  enable_jack=auto
 fi
 
 
-
-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
-	        SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
+    have_jack=no
+    check_allowed jack $enable_jack
+    if test $enable_jack != no -a $plugin_allowed = yes ; then
+        test_jack
+        if test $have_jack = yes ; then
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+        elif test $enable_jack = yes ; then
+            as_fn_error $? "Missing dependency for JACK output" "$LINENO" 5
         else
-	        SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JACK output disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: JACK output disabled due to missing dependency" >&2;}
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SIDPLAYFP_PKG_ERRORS" >&5
-
-	if test "x$enable_sid" = "xyes"; then
-            as_fn_error $? "Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again" "$LINENO" 5
-         fi
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	if test "x$enable_sid" = "xyes"; then
-            as_fn_error $? "Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again" "$LINENO" 5
-         fi
-
-else
-	SIDPLAYFP_CFLAGS=$pkg_cv_SIDPLAYFP_CFLAGS
-	SIDPLAYFP_LIBS=$pkg_cv_SIDPLAYFP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_sidplay=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS sid"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** SID plugin disabled per user request ***" >&5
-$as_echo "*** SID plugin disabled per user request ***" >&6; }
-fi
-
-
-# Check whether --enable-oss4 was given.
-if test "${enable_oss4+set}" = set; then :
-  enableval=$enable_oss4; enable_oss4=$enableval
-else
-  enable_oss4=auto
-fi
+    fi
 
 
-OSS_CFLAGS=
-have_oss4=no
-if test "x$enable_oss4" != "xno" ; then
+test_oss4 () {
+    OSS_CFLAGS=
     if test -f "/etc/oss.conf"; then
         . "/etc/oss.conf"
         OSS_CFLAGS="-I$OSSLIBDIR/include"
     fi
 
+
     OLD_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
+    have_oss4=no
     for ac_header in sys/soundcard.h soundcard.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11666,48 +11761,68 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- have_oss4=yes
+
+        have_oss4=yes
+        break
+
 fi
 
 done
 
     CPPFLAGS="$OLD_CPPFLAGS"
+}
 
-    if test "x$have_oss4" = "xyes" ; then
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
 
-    elif test "x$enable_oss4" = "xyes" ; then
-        as_fn_error $? "OSS4 output was enabled but soundcard.h was not found" "$LINENO" 5
-    fi
+    # Check whether --enable-oss4 was given.
+if test "${enable_oss4+set}" = set; then :
+  enableval=$enable_oss4; enable_oss4=$enableval
+else
+  enable_oss4=auto
 fi
 
 
-# Check whether --enable-alsa was given.
-if test "${enable_alsa+set}" = set; then :
-  enableval=$enable_alsa; enable_alsa=$enableval
-else
-  enable_alsa=auto
+    have_oss4=no
+    check_allowed oss4 $enable_oss4
+    if test $enable_oss4 != no -a $plugin_allowed = yes ; then
+        test_oss4
+        if test $have_oss4 = yes ; then
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+        elif test $enable_oss4 = yes ; then
+            as_fn_error $? "Missing dependency for OSS output" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OSS output disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: OSS output disabled due to missing dependency" >&2;}
+        fi
+    fi
+
 
+
+    # Check whether --enable-pulse was given.
+if test "${enable_pulse+set}" = set; then :
+  enableval=$enable_pulse; enable_pulse=$enableval
+else
+  enable_pulse=auto
 fi
 
 
-have_alsa=no
-if test "x$enable_alsa" != "xno"; then
+    have_pulse=no
+    check_allowed pulse $enable_pulse
+    if test $enable_pulse != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
-$as_echo_n "checking for ALSA... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
+$as_echo_n "checking for PULSE... " >&6; }
 
-if test -n "$ALSA_CFLAGS"; then
-    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+if test -n "$PULSE_CFLAGS"; then
+    pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.16" 2>/dev/null`
+  pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11715,16 +11830,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$ALSA_LIBS"; then
-    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+if test -n "$PULSE_LIBS"; then
+    pkg_cv_PULSE_LIBS="$PULSE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.16" 2>/dev/null`
+  pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11745,81 +11860,130 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
+	        PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
         else
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
+	        PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$ALSA_PKG_ERRORS" >&5
+	echo "$PULSE_PKG_ERRORS" >&5
+
+
+            if test $enable_pulse = yes ; then
+                as_fn_error $? "Missing dependency for PulseAudio output: libpulse >= 0.9.5" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.5" >&5
+$as_echo "$as_me: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.5" >&2;}
+            fi
 
-	if test "x$enable_alsa" = "xyes"; then
-            as_fn_error $? "Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again" "$LINENO" 5
-         fi
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_alsa" = "xyes"; then
-            as_fn_error $? "Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_pulse = yes ; then
+                as_fn_error $? "Missing dependency for PulseAudio output: libpulse >= 0.9.5" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.5" >&5
+$as_echo "$as_me: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.5" >&2;}
+            fi
+
 else
-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
+	PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
+	PULSE_LIBS=$pkg_cv_PULSE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_alsa=yes
-         OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** ALSA output plugin disabled per user request ***" >&5
-$as_echo "*** ALSA output plugin disabled per user request ***" >&6; }
+
+            have_pulse=yes
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse"
+
 fi
+    fi
 
 
-# Check whether --enable-sdlout was given.
-if test "${enable_sdlout+set}" = set; then :
-  enableval=$enable_sdlout; enable_sdlout=$enableval
+test_sndio () {
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sio_open in -lsndio" >&5
+$as_echo_n "checking for sio_open in -lsndio... " >&6; }
+if ${ac_cv_lib_sndio_sio_open+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  enable_sdlout=auto
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsndio  $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 sio_open ();
+int
+main ()
+{
+return sio_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sndio_sio_open=yes
+else
+  ac_cv_lib_sndio_sio_open=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_sndio_sio_open" >&5
+$as_echo "$ac_cv_lib_sndio_sio_open" >&6; }
+if test "x$ac_cv_lib_sndio_sio_open" = xyes; then :
+  have_sndio=yes
+else
+  have_sndio=no
 fi
 
+}
 
-if test "x$enable_sdlout" != "xno"; then
 
-# Check whether --with-libsdl was given.
-if test "${with_libsdl+set}" = set; then :
-  withval=$with_libsdl; case "x$withval" in
-                     x1) ;;
-                     x2) ;;
-                     x*) withval=check;;
-                 esac
-                 with_libsdl=$withval
+    # Check whether --enable-sndio was given.
+if test "${enable_sndio+set}" = set; then :
+  enableval=$enable_sndio; enable_sndio=$enableval
 else
-  with_libsdl=check
+  enable_sndio=auto
 fi
 
-fi
 
-libsdl1_min="1.2.11";
-libsdl2_min="2.0";
+    have_sndio=no
+    check_allowed sndio $enable_sndio
+    if test $enable_sndio != no -a $plugin_allowed = yes ; then
+        test_sndio
+        if test $have_sndio = yes ; then
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+        elif test $enable_sndio = yes ; then
+            as_fn_error $? "Missing dependency for Sndio output" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sndio output disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: Sndio output disabled due to missing dependency" >&2;}
+        fi
+    fi
 
-have_sdlout=no
-if test "x$enable_sdlout" != "xno"; then
-    if test "x$with_libsdl" = "xcheck"; then
+
+test_cue () {
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
+$as_echo_n "checking for CUE... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
-    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$CUE_CFLAGS"; then
+    pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$libsdl2_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $libsdl2_min" 2>/dev/null`
+  pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11827,16 +11991,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
-    pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$CUE_LIBS"; then
+    pkg_cv_CUE_LIBS="$CUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$libsdl2_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $libsdl2_min" 2>/dev/null`
+  pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11857,28 +12021,29 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue >= 2.0" 2>&1`
         else
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+	echo "$CUE_PKG_ERRORS" >&5
+
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
+$as_echo_n "checking for CUE... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
-    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$CUE_CFLAGS"; then
+    pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11886,16 +12051,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
-    pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$CUE_LIBS"; then
+    pkg_cv_CUE_LIBS="$CUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11916,48 +12081,45 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
         else
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+	echo "$CUE_PKG_ERRORS" >&5
 
-	if test "x$enable_sdlout" = "xyes"; then
-                   as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
-                fi
+	have_cue=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_sdlout" = "xyes"; then
-                   as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
-                fi
+	have_cue=no
 else
-	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
-	SDL_LIBS=$pkg_cv_SDL_LIBS
+	CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+	CUE_LIBS=$pkg_cv_CUE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_sdlout=yes
-                OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+	have_cue=yes
 fi
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
+
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
+$as_echo_n "checking for CUE... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
-    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$CUE_CFLAGS"; then
+    pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11965,16 +12127,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
-    pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$CUE_LIBS"; then
+    pkg_cv_CUE_LIBS="$CUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11995,54 +12157,91 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
         else
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+	echo "$CUE_PKG_ERRORS" >&5
 
-	if test "x$enable_sdlout" = "xyes"; then
-                   as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
-                fi
+	have_cue=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_sdlout" = "xyes"; then
-                   as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
-                fi
+	have_cue=no
 else
-	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
-	SDL_LIBS=$pkg_cv_SDL_LIBS
+	CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+	CUE_LIBS=$pkg_cv_CUE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_sdlout=yes
-                OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+	have_cue=yes
 fi
+
 else
-	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
-	SDL_LIBS=$pkg_cv_SDL_LIBS
+	CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+	CUE_LIBS=$pkg_cv_CUE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_sdlout=yes
-            OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+
+
+$as_echo "#define HAVE_LIBCUE2 1" >>confdefs.h
+
+        have_cue=yes
+
 fi
-    elif test "x$with_libsdl" = "x1"; then
+}
+
+
+    # Check whether --enable-cue was given.
+if test "${enable_cue+set}" = set; then :
+  enableval=$enable_cue; enable_cue=$enableval
+else
+  enable_cue=auto
+fi
+
+
+    have_cue=no
+    check_allowed cue $enable_cue
+    if test $enable_cue != no -a $plugin_allowed = yes ; then
+        test_cue
+        if test $have_cue = yes ; then
+            CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
+        elif test $enable_cue = yes ; then
+            as_fn_error $? "Missing dependency for cue sheet support" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cue sheet support disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: cue sheet support disabled due to missing dependency" >&2;}
+        fi
+    fi
+
+
+
+    # Check whether --enable-neon was given.
+if test "${enable_neon+set}" = set; then :
+  enableval=$enable_neon; enable_neon=$enableval
+else
+  enable_neon=yes
+fi
+
+
+    have_neon=no
+    check_allowed neon $enable_neon
+    if test $enable_neon != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEON" >&5
+$as_echo_n "checking for NEON... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
-    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$NEON_CFLAGS"; then
+    pkg_cv_NEON_CFLAGS="$NEON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.27" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12050,16 +12249,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
-    pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$NEON_LIBS"; then
+    pkg_cv_NEON_LIBS="$NEON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= \$libsdl1_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+  pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.27" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12080,46 +12279,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        NEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "neon >= 0.27" 2>&1`
         else
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+	        NEON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "neon >= 0.27" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+	echo "$NEON_PKG_ERRORS" >&5
+
+
+            if test $enable_neon = yes ; then
+                as_fn_error $? "Missing dependency for HTTP/HTTPS transport: neon >= 0.27" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&5
+$as_echo "$as_me: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&2;}
+            fi
 
-	if test "x$enable_sdlout" = "xyes"; then
-                 as_fn_error $? "Cannot find SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 dev files and run configure again" "$LINENO" 5
-             fi
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_sdlout" = "xyes"; then
-                 as_fn_error $? "Cannot find SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 dev files and run configure again" "$LINENO" 5
-             fi
+
+            if test $enable_neon = yes ; then
+                as_fn_error $? "Missing dependency for HTTP/HTTPS transport: neon >= 0.27" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&5
+$as_echo "$as_me: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&2;}
+            fi
+
 else
-	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
-	SDL_LIBS=$pkg_cv_SDL_LIBS
+	NEON_CFLAGS=$pkg_cv_NEON_CFLAGS
+	NEON_LIBS=$pkg_cv_NEON_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_sdlout=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+
+            have_neon=yes
+            TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
+
 fi
-    elif test "x$with_libsdl" = "x2"; then
+    fi
+
+
+
+    # Check whether --enable-mms was given.
+if test "${enable_mms+set}" = set; then :
+  enableval=$enable_mms; enable_mms=$enableval
+else
+  enable_mms=auto
+fi
+
+
+    have_mms=no
+    check_allowed mms $enable_mms
+    if test $enable_mms != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMS" >&5
+$as_echo_n "checking for MMS... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
-    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$MMS_CFLAGS"; then
+    pkg_cv_MMS_CFLAGS="$MMS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$libsdl2_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $libsdl2_min" 2>/dev/null`
+  pkg_cv_MMS_CFLAGS=`$PKG_CONFIG --cflags "libmms >= 0.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12127,16 +12352,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
-    pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$MMS_LIBS"; then
+    pkg_cv_MMS_LIBS="$MMS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$libsdl2_min\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $libsdl2_min" 2>/dev/null`
+  pkg_cv_MMS_LIBS=`$PKG_CONFIG --libs "libmms >= 0.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12157,132 +12382,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+	        MMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
         else
-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+	        MMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+	echo "$MMS_PKG_ERRORS" >&5
+
+
+            if test $enable_mms = yes ; then
+                as_fn_error $? "Missing dependency for MMS transport: libmms >= 0.3" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&5
+$as_echo "$as_me: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&2;}
+            fi
 
-	if test "x$enable_sdlout" = "xyes"; then
-                 as_fn_error $? "Cannot find SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 dev files and run configure again" "$LINENO" 5
-             fi
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_sdlout" = "xyes"; then
-                 as_fn_error $? "Cannot find SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 dev files and run configure again" "$LINENO" 5
-             fi
-else
-	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
-	SDL_LIBS=$pkg_cv_SDL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_sdlout=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
-fi
-    fi
-fi
-
-
-# Check whether --enable-sndio was given.
-if test "${enable_sndio+set}" = set; then :
-  enableval=$enable_sndio; enable_sndio=$enableval
-else
-  enable_sndio=auto
-
-fi
 
+            if test $enable_mms = yes ; then
+                as_fn_error $? "Missing dependency for MMS transport: libmms >= 0.3" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&5
+$as_echo "$as_me: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&2;}
+            fi
 
-have_sndio=no
-if test "x$enable_sndio" != "xno"; then
-    ac_fn_c_check_header_mongrel "$LINENO" "sndio.h" "ac_cv_header_sndio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sndio_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sio_open in -lsndio" >&5
-$as_echo_n "checking for sio_open in -lsndio... " >&6; }
-if ${ac_cv_lib_sndio_sio_open+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsndio  $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 sio_open ();
-int
-main ()
-{
-return sio_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sndio_sio_open=yes
-else
-  ac_cv_lib_sndio_sio_open=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_sndio_sio_open" >&5
-$as_echo "$ac_cv_lib_sndio_sio_open" >&6; }
-if test "x$ac_cv_lib_sndio_sio_open" = xyes; then :
-  have_sndio=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio-ng"
-             SNDIO_LIBS="-lsndio"
-
-
-fi
+	MMS_CFLAGS=$pkg_cv_MMS_CFLAGS
+	MMS_LIBS=$pkg_cv_MMS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+            have_mms=yes
+            TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
 
 fi
-
-
-
-    if test "x$enable_sndio" = "xyes" -a "x$have_sndio" != "xyes"; then
-        as_fn_error $? "Cannot find sndio development files, but compilation of sndio output plugin has been explicitly requested; please install sndio dev files and run configure again" "$LINENO" 5
     fi
-fi
 
 
-if test "x$OUTPUT_PLUGINS" = "x" ; then
-    as_fn_error $? "No output plugin was enabled.  Please install the necessary packages for your system and run configure again." "$LINENO" 5
-fi
 
-
-# Check whether --enable-amidiplug was given.
-if test "${enable_amidiplug+set}" = set; then :
-  enableval=$enable_amidiplug; enable_amidiplug=$enableval
+    # Check whether --enable-gnomeshortcuts was given.
+if test "${enable_gnomeshortcuts+set}" = set; then :
+  enableval=$enable_gnomeshortcuts; enable_gnomeshortcuts=$enableval
 else
-  enable_amidiplug=auto
+  enable_gnomeshortcuts=auto
 fi
 
 
-have_amidiplug=no
-if test "x$enable_amidiplug" != "xno"; then
+    have_gnomeshortcuts=no
+    check_allowed gnomeshortcuts $enable_gnomeshortcuts
+    if test $enable_gnomeshortcuts != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
-$as_echo_n "checking for FLUIDSYNTH... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+$as_echo_n "checking for DBUS... " >&6; }
 
-if test -n "$FLUIDSYNTH_CFLAGS"; then
-    pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
+if test -n "$DBUS_CFLAGS"; then
+    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.0.6" 2>/dev/null`
+  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12290,16 +12455,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$FLUIDSYNTH_LIBS"; then
-    pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
+if test -n "$DBUS_LIBS"; then
+    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.0.6" 2>/dev/null`
+  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12320,59 +12485,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
         else
-	        FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$FLUIDSYNTH_PKG_ERRORS" >&5
+	echo "$DBUS_PKG_ERRORS" >&5
+
+
+            if test $enable_gnomeshortcuts = yes ; then
+                as_fn_error $? "Missing dependency for GNOME shortcuts: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNOME shortcuts disabled due to missing dependency: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" >&5
+$as_echo "$as_me: WARNING: GNOME shortcuts disabled due to missing dependency: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" >&2;}
+            fi
 
-	if test "x$enable_amidiplug" = "xyes"; then
-            as_fn_error $? "Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth dev files and run configure again" "$LINENO" 5
-         fi
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_amidiplug" = "xyes"; then
-            as_fn_error $? "Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_gnomeshortcuts = yes ; then
+                as_fn_error $? "Missing dependency for GNOME shortcuts: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNOME shortcuts disabled due to missing dependency: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" >&5
+$as_echo "$as_me: WARNING: GNOME shortcuts disabled due to missing dependency: dbus-1 >= 0.60 dbus-glib-1 >= 0.60" >&2;}
+            fi
+
 else
-	FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS
-	FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS
+	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+	DBUS_LIBS=$pkg_cv_DBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_amidiplug=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
-fi
+
+            have_gnomeshortcuts=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"
+
 fi
+    fi
 
 
-# Check whether --enable-cdaudio was given.
-if test "${enable_cdaudio+set}" = set; then :
-  enableval=$enable_cdaudio; enable_cdaudio_ng=$enableval
-else
-  enable_cdaudio_ng=auto
 
+    # Check whether --enable-notify was given.
+if test "${enable_notify+set}" = set; then :
+  enableval=$enable_notify; enable_notify=$enableval
+else
+  enable_notify=auto
 fi
 
 
-have_cdaudio_ng=no
-if test "x$enable_cdaudio_ng" != "xno"; then
+    have_notify=no
+    check_allowed notify $enable_notify
+    if test $enable_notify != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
-$as_echo_n "checking for CDIO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
+$as_echo_n "checking for NOTIFY... " >&6; }
 
-if test -n "$CDIO_CFLAGS"; then
-    pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
+if test -n "$NOTIFY_CFLAGS"; then
+    pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
+  pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12380,16 +12558,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CDIO_LIBS"; then
-    pkg_cv_CDIO_LIBS="$CDIO_LIBS"
+if test -n "$NOTIFY_LIBS"; then
+    pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
+  pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12410,42 +12588,221 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>&1`
+	        NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>&1`
         else
-	        CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>&1`
+	        NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_PKG_ERRORS" >&5
+	echo "$NOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
+
+            if test $enable_notify = yes ; then
+                as_fn_error $? "Missing dependency for libnotify OSD: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&5
+$as_echo "$as_me: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
+
+            if test $enable_notify = yes ; then
+                as_fn_error $? "Missing dependency for libnotify OSD: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&5
+$as_echo "$as_me: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&2;}
+            fi
 
 else
-	CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
-	CDIO_LIBS=$pkg_cv_CDIO_LIBS
+	NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS
+	NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+            have_notify=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
+
+fi
+    fi
+
+
+test_lirc () {
+    for ac_header in lirc/lirc_client.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_lirc_lirc_client_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIRC_LIRC_CLIENT_H 1
+_ACEOF
+ have_lirc=yes
+else
+  have_lirc=no
+fi
+
+done
+
+}
+
+
+    # Check whether --enable-lirc was given.
+if test "${enable_lirc+set}" = set; then :
+  enableval=$enable_lirc; enable_lirc=$enableval
+else
+  enable_lirc=auto
+fi
+
+
+    have_lirc=no
+    check_allowed lirc $enable_lirc
+    if test $enable_lirc != no -a $plugin_allowed = yes ; then
+        test_lirc
+        if test $have_lirc = yes ; then
+            GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
+        elif test $enable_lirc = yes ; then
+            as_fn_error $? "Missing dependency for LIRC support" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LIRC support disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: LIRC support disabled due to missing dependency" >&2;}
+        fi
+    fi
+
+
+test_mpris2 () {
+    unset have_mpris2
+    # Extract the first word of "gdbus-codegen", so it can be a program name with args.
+set dummy gdbus-codegen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_have_mpris2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_mpris2"; then
+  ac_cv_prog_have_mpris2="$have_mpris2" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_mpris2="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_mpris2" && ac_cv_prog_have_mpris2="no"
+fi
+fi
+have_mpris2=$ac_cv_prog_have_mpris2
+if test -n "$have_mpris2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mpris2" >&5
+$as_echo "$have_mpris2" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+}
+
+
+    # Check whether --enable-mpris2 was given.
+if test "${enable_mpris2+set}" = set; then :
+  enableval=$enable_mpris2; enable_mpris2=$enableval
+else
+  enable_mpris2=auto
+fi
+
+
+    have_mpris2=no
+    check_allowed mpris2 $enable_mpris2
+    if test $enable_mpris2 != no -a $plugin_allowed = yes ; then
+        test_mpris2
+        if test $have_mpris2 = yes ; then
+            GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+        elif test $enable_mpris2 = yes ; then
+            as_fn_error $? "Missing dependency for MPRIS 2 server" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MPRIS 2 server disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: MPRIS 2 server disabled due to missing dependency" >&2;}
+        fi
+    fi
+
+
+test_songchange () {
+    for ac_header in sys/wait.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_wait_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_WAIT_H 1
+_ACEOF
+ have_songchange=yes
+else
+  have_songchange=no
+fi
+
+done
+
+}
+
+
+    # Check whether --enable-songchange was given.
+if test "${enable_songchange+set}" = set; then :
+  enableval=$enable_songchange; enable_songchange=$enableval
+else
+  enable_songchange=auto
+fi
+
+
+    have_songchange=no
+    check_allowed songchange $enable_songchange
+    if test $enable_songchange != no -a $plugin_allowed = yes ; then
+        test_songchange
+        if test $have_songchange = yes ; then
+            GENERAL_PLUGINS="$GENERAL_PLUGINS songchange"
+        elif test $enable_songchange = yes ; then
+            as_fn_error $? "Missing dependency for song change plugin" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: song change plugin disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: song change plugin disabled due to missing dependency" >&2;}
+        fi
+    fi
+
+
+
+
+    # Check whether --enable-scrobbler2 was given.
+if test "${enable_scrobbler2+set}" = set; then :
+  enableval=$enable_scrobbler2; enable_scrobbler2=$enableval
+else
+  enable_scrobbler2=auto
+fi
+
+
+    have_scrobbler2=no
+    check_allowed scrobbler2 $enable_scrobbler2
+    if test $enable_scrobbler2 != no -a $plugin_allowed = yes ; then
+
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDDB" >&5
-$as_echo_n "checking for CDDB... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
+$as_echo_n "checking for CURL... " >&6; }
 
-if test -n "$CDDB_CFLAGS"; then
-    pkg_cv_CDDB_CFLAGS="$CDDB_CFLAGS"
+if test -n "$CURL_CFLAGS"; then
+    pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 1.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcddb >= 1.2.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CDDB_CFLAGS=`$PKG_CONFIG --cflags "libcddb >= 1.2.1" 2>/dev/null`
+  pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.9.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12453,16 +12810,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CDDB_LIBS"; then
-    pkg_cv_CDDB_LIBS="$CDDB_LIBS"
+if test -n "$CURL_LIBS"; then
+    pkg_cv_CURL_LIBS="$CURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 1.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcddb >= 1.2.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CDDB_LIBS=`$PKG_CONFIG --libs "libcddb >= 1.2.1" 2>/dev/null`
+  pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.9.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12483,73 +12840,150 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcddb >= 1.2.1" 2>&1`
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
         else
-	        CDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcddb >= 1.2.1" 2>&1`
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CDDB_PKG_ERRORS" >&5
+	echo "$CURL_PKG_ERRORS" >&5
+
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&2;}
+            if test $enable_scrobbler2 = yes ; then
+                as_fn_error $? "Missing dependency for Scrobbler 2: libcurl >= 7.9.7" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&5
+$as_echo "$as_me: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&2;}
+
+            if test $enable_scrobbler2 = yes ; then
+                as_fn_error $? "Missing dependency for Scrobbler 2: libcurl >= 7.9.7" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&5
+$as_echo "$as_me: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&2;}
+            fi
 
 else
-	CDDB_CFLAGS=$pkg_cv_CDDB_CFLAGS
-	CDDB_LIBS=$pkg_cv_CDDB_LIBS
+	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
+	CURL_LIBS=$pkg_cv_CURL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_cdaudio_ng=yes
-             INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
-             GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
 
+            have_scrobbler2=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2"
 
+fi
+    fi
 
 
+test_glspectrum () {
+    if test $HAVE_MSWINDOWS = yes ; then
+        have_glspectrum=yes
+        GL_LIBS="-lopengl32"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
+$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glXCreateContext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGL  $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 glXCreateContext ();
+int
+main ()
+{
+return glXCreateContext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GL_glXCreateContext=yes
+else
+  ac_cv_lib_GL_glXCreateContext=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_GL_glXCreateContext" >&5
+$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
+if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
 
-    if test "x$enable_cdaudio_ng" = "xyes" -a "x$have_cdaudio_ng" != "xyes"; then
-        as_fn_error $? "Compilation of cdaudio-ng input plugin has been explicitly requested; please install required dev files and run configure again" "$LINENO" 5
-    fi
+            have_glspectrum=yes
+            GL_LIBS="-lGL -lX11"
+
+else
+  have_glspectrum=no
 fi
 
+    fi
 
-# Check whether --enable-scrobbler2 was given.
-if test "${enable_scrobbler2+set}" = set; then :
-  enableval=$enable_scrobbler2; enable_scrobbler2=$enableval
+}
+
+
+    # Check whether --enable-glspectrum was given.
+if test "${enable_glspectrum+set}" = set; then :
+  enableval=$enable_glspectrum; enable_glspectrum=$enableval
 else
-  enable_scrobbler2=auto
+  enable_glspectrum=auto
 fi
 
 
-have_scrobbler2=no
+    have_glspectrum=no
+    check_allowed glspectrum $enable_glspectrum
+    if test $enable_glspectrum != no -a $plugin_allowed = yes ; then
+        test_glspectrum
+        if test $have_glspectrum = yes ; then
+            VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS glspectrum"
+        elif test $enable_glspectrum = yes ; then
+            as_fn_error $? "Missing dependency for OpenGL spectrum analyzer" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL spectrum analyzer disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: OpenGL spectrum analyzer disabled due to missing dependency" >&2;}
+        fi
+    fi
 
-if test $enable_scrobbler2 = yes -a $USE_GTK != yes ; then
-    as_fn_error $? "--enable-scrobbler2 cannot be used without --enable-gtk" "$LINENO" 5
+
+
+    # Check whether --enable-hotkey was given.
+if test "${enable_hotkey+set}" = set; then :
+  enableval=$enable_hotkey; enable_hotkey=$enableval
+else
+  enable_hotkey=auto
 fi
 
-if test $enable_scrobbler2 != no -a $USE_GTK = yes ; then
+
+    have_hotkey=no
+    check_allowed hotkey $enable_hotkey
+    if test $enable_hotkey != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
-$as_echo_n "checking for CURL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKX11" >&5
+$as_echo_n "checking for GDKX11... " >&6; }
 
-if test -n "$CURL_CFLAGS"; then
-    pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
+if test -n "$GDKX11_CFLAGS"; then
+    pkg_cv_GDKX11_CFLAGS="$GDKX11_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.9.7" 2>/dev/null`
+  pkg_cv_GDKX11_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12557,16 +12991,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CURL_LIBS"; then
-    pkg_cv_CURL_LIBS="$CURL_LIBS"
+if test -n "$GDKX11_LIBS"; then
+    pkg_cv_GDKX11_LIBS="$GDKX11_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.9.7" 2>/dev/null`
+  pkg_cv_GDKX11_LIBS=`$PKG_CONFIG --libs "gdk-x11-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12587,61 +13021,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
+	        GDKX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-x11-2.0" 2>&1`
         else
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
+	        GDKX11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-x11-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CURL_PKG_ERRORS" >&5
+	echo "$GDKX11_PKG_ERRORS" >&5
 
-	if test "x$enable_scrobbler2" = "xyes"; then
-            as_fn_error $? "Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_hotkey = yes ; then
+                as_fn_error $? "Missing dependency for global hotkeys (X11): gdk-x11-2.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: gdk-x11-2.0" >&5
+$as_echo "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: gdk-x11-2.0" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_scrobbler2" = "xyes"; then
-            as_fn_error $? "Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_hotkey = yes ; then
+                as_fn_error $? "Missing dependency for global hotkeys (X11): gdk-x11-2.0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: gdk-x11-2.0" >&5
+$as_echo "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: gdk-x11-2.0" >&2;}
+            fi
 
 else
-	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
-	CURL_LIBS=$pkg_cv_CURL_LIBS
+	GDKX11_CFLAGS=$pkg_cv_GDKX11_CFLAGS
+	GDKX11_LIBS=$pkg_cv_GDKX11_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_scrobbler2=yes
 
+            have_hotkey=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
 
-         GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2"
-fi
 fi
+    fi
 
 
-# Check whether --enable-neon was given.
-if test "${enable_neon+set}" = set; then :
-  enableval=$enable_neon; enable_neon=$enableval
+
+    # Check whether --enable-aosd was given.
+if test "${enable_aosd+set}" = set; then :
+  enableval=$enable_aosd; enable_aosd=$enableval
 else
-  enable_neon=yes
+  enable_aosd=auto
 fi
 
 
-if test $enable_neon = yes ; then
+    have_aosd=no
+    check_allowed aosd $enable_aosd
+    if test $enable_aosd != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEON" >&5
-$as_echo_n "checking for NEON... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXT" >&5
+$as_echo_n "checking for X11EXT... " >&6; }
 
-if test -n "$NEON_CFLAGS"; then
-    pkg_cv_NEON_CFLAGS="$NEON_CFLAGS"
+if test -n "$X11EXT_CFLAGS"; then
+    pkg_cv_X11EXT_CFLAGS="$X11EXT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender xcomposite\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xrender xcomposite") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.27" 2>/dev/null`
+  pkg_cv_X11EXT_CFLAGS=`$PKG_CONFIG --cflags "xrender xcomposite" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12649,16 +13094,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$NEON_LIBS"; then
-    pkg_cv_NEON_LIBS="$NEON_LIBS"
+if test -n "$X11EXT_LIBS"; then
+    pkg_cv_X11EXT_LIBS="$X11EXT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender xcomposite\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xrender xcomposite") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.27" 2>/dev/null`
+  pkg_cv_X11EXT_LIBS=`$PKG_CONFIG --libs "xrender xcomposite" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12679,74 +13124,73 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "neon >= 0.27" 2>&1`
+	        X11EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrender xcomposite" 2>&1`
         else
-	        NEON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "neon >= 0.27" 2>&1`
+	        X11EXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrender xcomposite" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$NEON_PKG_ERRORS" >&5
+	echo "$X11EXT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (neon >= 0.27) were not met:
 
-$NEON_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+            if test $enable_aosd = yes ; then
+                as_fn_error $? "Missing dependency for X11 OSD: xrender xcomposite" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&5
+$as_echo "$as_me: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&2;}
+            fi
 
-Alternatively, you may set the environment variables NEON_CFLAGS
-and NEON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
 
-Alternatively, you may set the environment variables NEON_CFLAGS
-and NEON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+            if test $enable_aosd = yes ; then
+                as_fn_error $? "Missing dependency for X11 OSD: xrender xcomposite" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&5
+$as_echo "$as_me: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&2;}
+            fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 else
-	NEON_CFLAGS=$pkg_cv_NEON_CFLAGS
-	NEON_LIBS=$pkg_cv_NEON_LIBS
+	X11EXT_CFLAGS=$pkg_cv_X11EXT_CFLAGS
+	X11EXT_LIBS=$pkg_cv_X11EXT_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+            have_aosd=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
+
 fi
-    TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
-fi
+    fi
 
 
-# Check whether --enable-mms was given.
-if test "${enable_mms+set}" = set; then :
-  enableval=$enable_mms; enable_mms=$enableval
+
+
+    # Check whether --enable-ampache was given.
+if test "${enable_ampache+set}" = set; then :
+  enableval=$enable_ampache; enable_ampache=$enableval
 else
-  enable_mms=auto
+  enable_ampache=auto
 fi
 
 
-have_mms=no
-if test "x$enable_mms" != "xno"; then
+    have_ampache=no
+    check_allowed ampache $enable_ampache
+    if test $enable_ampache != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMS" >&5
-$as_echo_n "checking for MMS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AMPACHE" >&5
+$as_echo_n "checking for AMPACHE... " >&6; }
 
-if test -n "$MMS_CFLAGS"; then
-    pkg_cv_MMS_CFLAGS="$MMS_CFLAGS"
+if test -n "$AMPACHE_CFLAGS"; then
+    pkg_cv_AMPACHE_CFLAGS="$AMPACHE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ampache_browser_0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ampache_browser_0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MMS_CFLAGS=`$PKG_CONFIG --cflags "libmms >= 0.3" 2>/dev/null`
+  pkg_cv_AMPACHE_CFLAGS=`$PKG_CONFIG --cflags "ampache_browser_0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12754,16 +13198,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$MMS_LIBS"; then
-    pkg_cv_MMS_LIBS="$MMS_LIBS"
+if test -n "$AMPACHE_LIBS"; then
+    pkg_cv_AMPACHE_LIBS="$AMPACHE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ampache_browser_0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ampache_browser_0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MMS_LIBS=`$PKG_CONFIG --libs "libmms >= 0.3" 2>/dev/null`
+  pkg_cv_AMPACHE_LIBS=`$PKG_CONFIG --libs "ampache_browser_0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12784,63 +13228,72 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
+	        AMPACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ampache_browser_0" 2>&1`
         else
-	        MMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
+	        AMPACHE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ampache_browser_0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$MMS_PKG_ERRORS" >&5
+	echo "$AMPACHE_PKG_ERRORS" >&5
 
-	if test "x$enable_mms" = "xyes"; then
-            as_fn_error $? "Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_ampache = yes ; then
+                as_fn_error $? "Missing dependency for Ampache browser: ampache_browser_0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_0" >&5
+$as_echo "$as_me: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_0" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_mms" = "xyes"; then
-            as_fn_error $? "Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_ampache = yes ; then
+                as_fn_error $? "Missing dependency for Ampache browser: ampache_browser_0" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_0" >&5
+$as_echo "$as_me: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_0" >&2;}
+            fi
 
 else
-	MMS_CFLAGS=$pkg_cv_MMS_CFLAGS
-	MMS_LIBS=$pkg_cv_MMS_LIBS
+	AMPACHE_CFLAGS=$pkg_cv_AMPACHE_CFLAGS
+	AMPACHE_LIBS=$pkg_cv_AMPACHE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_mms=yes
-         TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** mms plugin disabled by request ***" >&5
-$as_echo "*** mms plugin disabled by request ***" >&6; }
+
+            have_ampache=yes
+            GENERAL_PLUGINS="$GENERAL_PLUGINS ampache"
+
 fi
+    fi
 
 
-# Check whether --enable-cue was given.
-if test "${enable_cue+set}" = set; then :
-  enableval=$enable_cue; enable_cue=$enableval
+
+    # Check whether --enable-qtaudio was given.
+if test "${enable_qtaudio+set}" = set; then :
+  enableval=$enable_qtaudio; enable_qtaudio=$enableval
 else
-  enable_cue=auto
+  enable_qtaudio=auto
 fi
 
 
-have_cue=no
-if test "x$enable_cue" != "xno"; then
+    have_qtaudio=no
+    check_allowed qtaudio $enable_qtaudio
+    if test $enable_qtaudio != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
-$as_echo_n "checking for CUE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTMULTIMEDIA" >&5
+$as_echo_n "checking for QTMULTIMEDIA... " >&6; }
 
-if test -n "$CUE_CFLAGS"; then
-    pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
+if test -n "$QTMULTIMEDIA_CFLAGS"; then
+    pkg_cv_QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
+  pkg_cv_QTMULTIMEDIA_CFLAGS=`$PKG_CONFIG --cflags "Qt5Multimedia" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12848,16 +13301,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CUE_LIBS"; then
-    pkg_cv_CUE_LIBS="$CUE_LIBS"
+if test -n "$QTMULTIMEDIA_LIBS"; then
+    pkg_cv_QTMULTIMEDIA_LIBS="$QTMULTIMEDIA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
+  pkg_cv_QTMULTIMEDIA_LIBS=`$PKG_CONFIG --libs "Qt5Multimedia" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12878,76 +13331,130 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
+	        QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
         else
-	        CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
+	        QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CUE_PKG_ERRORS" >&5
+	echo "$QTMULTIMEDIA_PKG_ERRORS" >&5
 
-	if test "x$enable_cue" = "xyes"; then
-            as_fn_error $? "Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_qtaudio = yes ; then
+                as_fn_error $? "Missing dependency for QtMultimedia output: Qt5Multimedia" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: QtMultimedia output disabled due to missing dependency: Qt5Multimedia" >&5
+$as_echo "$as_me: WARNING: QtMultimedia output disabled due to missing dependency: Qt5Multimedia" >&2;}
+            fi
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_cue" = "xyes"; then
-            as_fn_error $? "Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again" "$LINENO" 5
-         fi
+
+            if test $enable_qtaudio = yes ; then
+                as_fn_error $? "Missing dependency for QtMultimedia output: Qt5Multimedia" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: QtMultimedia output disabled due to missing dependency: Qt5Multimedia" >&5
+$as_echo "$as_me: WARNING: QtMultimedia output disabled due to missing dependency: Qt5Multimedia" >&2;}
+            fi
 
 else
-	CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
-	CUE_LIBS=$pkg_cv_CUE_LIBS
+	QTMULTIMEDIA_CFLAGS=$pkg_cv_QTMULTIMEDIA_CFLAGS
+	QTMULTIMEDIA_LIBS=$pkg_cv_QTMULTIMEDIA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_cue=yes
-         CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
-fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cue plugin disabled by request ***" >&5
-$as_echo "*** cue plugin disabled by request ***" >&6; }
+
+            have_qtaudio=yes
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
+
 fi
+    fi
 
 
-# Check whether --enable-filewriter was given.
-if test "${enable_filewriter+set}" = set; then :
-  enableval=$enable_filewriter; enable_filewriter=$enableval
-else
-  enable_filewriter=$USE_GTK
+test_qtglspectrum () {
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTOPENGL" >&5
+$as_echo_n "checking for QTOPENGL... " >&6; }
 
+if test -n "$QTOPENGL_CFLAGS"; then
+    pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5OpenGL\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_QTOPENGL_CFLAGS=`$PKG_CONFIG --cflags "Qt5OpenGL" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$QTOPENGL_LIBS"; then
+    pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5OpenGL\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs "Qt5OpenGL" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
 
-have_filewriter=no
-if test "x$enable_filewriter" != "xno"; then
-    if test "x$USE_GTK" != "xyes"; then
-        as_fn_error $? "--enable-filewriter cannot be used without --enable-gtk" "$LINENO" 5
-    fi
-    have_filewriter=yes
-    OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
-fi
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-# Check whether --enable-filewriter_mp3 was given.
-if test "${enable_filewriter_mp3+set}" = set; then :
-  enableval=$enable_filewriter_mp3; enable_filewriter_mp3=$enableval
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  enable_filewriter_mp3=auto
-
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
+        else
+	        QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$QTOPENGL_PKG_ERRORS" >&5
 
+	have_qtglspectrum=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_qtglspectrum=no
+else
+	QTOPENGL_CFLAGS=$pkg_cv_QTOPENGL_CFLAGS
+	QTOPENGL_LIBS=$pkg_cv_QTOPENGL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-have_lame=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_get_id3v2_tag in -lmp3lame" >&5
-$as_echo_n "checking for lame_get_id3v2_tag in -lmp3lame... " >&6; }
-if ${ac_cv_lib_mp3lame_lame_get_id3v2_tag+:} false; then :
+        QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
+        if test $have_glspectrum = yes ; then
+            have_qtglspectrum=yes
+        elif test $HAVE_MSWINDOWS = yes ; then
+            have_qtglspectrum=yes
+            GL_LIBS="-lopengl32"
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5
+$as_echo_n "checking for glBegin in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glBegin+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmp3lame -lm
-     $LIBS"
+LIBS="-lGL  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12957,77 +13464,112 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char lame_get_id3v2_tag ();
+char glBegin ();
 int
 main ()
 {
-return lame_get_id3v2_tag ();
+return glBegin ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mp3lame_lame_get_id3v2_tag=yes
+  ac_cv_lib_GL_glBegin=yes
 else
-  ac_cv_lib_mp3lame_lame_get_id3v2_tag=no
+  ac_cv_lib_GL_glBegin=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_mp3lame_lame_get_id3v2_tag" >&5
-$as_echo "$ac_cv_lib_mp3lame_lame_get_id3v2_tag" >&6; }
-if test "x$ac_cv_lib_mp3lame_lame_get_id3v2_tag" = xyes; then :
-  have_lame=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5
+$as_echo "$ac_cv_lib_GL_glBegin" >&6; }
+if test "x$ac_cv_lib_GL_glBegin" = xyes; then :
 
-$as_echo "#define FILEWRITER_MP3 1" >>confdefs.h
+                have_qtglspectrum=yes
+                GL_LIBS="-lGL"
 
-         FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
 else
-  if test "x$enable_filewriter_mp3" = "xyes"; then
-            as_fn_error $? "Cannot find lame development files, but compilation of FileWriter MP3 output part has been explicitly requested; please install lame dev files and run configure again" "$LINENO" 5
-         fi
+  have_qtglspectrum=no
 fi
 
+        fi
+
+
 fi
+}
 
 
-have_vorbisenc=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_vorbis" = "xyes"; then
-    have_vorbisenc=yes
+    # Check whether --enable-qtglspectrum was given.
+if test "${enable_qtglspectrum+set}" = set; then :
+  enableval=$enable_qtglspectrum; enable_qtglspectrum=$enableval
+else
+  enable_qtglspectrum=auto
+fi
 
-$as_echo "#define FILEWRITER_VORBIS 1" >>confdefs.h
 
-    FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
-    FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
+    have_qtglspectrum=no
+    check_allowed qtglspectrum $enable_qtglspectrum
+    if test $enable_qtglspectrum != no -a $plugin_allowed = yes ; then
+        test_qtglspectrum
+        if test $have_qtglspectrum = yes ; then
+            VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS qtglspectrum"
+        elif test $enable_qtglspectrum = yes ; then
+            as_fn_error $? "Missing dependency for Qt OpenGL spectrum analyzer" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Qt OpenGL spectrum analyzer disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: Qt OpenGL spectrum analyzer disabled due to missing dependency" >&2;}
+        fi
+    fi
+
+
+
+# Check whether --enable-coreaudio was given.
+if test "${enable_coreaudio+set}" = set; then :
+  enableval=$enable_coreaudio; enable_coreaudio=$enableval
+else
+  enable_coreaudio=auto
+
 fi
 
-# Check whether --enable-filewriter_flac was given.
-if test "${enable_filewriter_flac+set}" = set; then :
-  enableval=$enable_filewriter_flac; enable_filewriter_flac=$enableval
+
+have_coreaudio=no
+if test "x$enable_coreaudio" != "xno"; then
+    if test "x$HAVE_DARWIN" != "xno"; then
+        have_coreaudio=yes
+        OUTPUT_PLUGINS="$OUTPUT_PLUGINS coreaudio"
+    fi
 else
-  enable_filewriter_flac=auto
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** CoreAudio output plugin disabled per user request ***" >&5
+$as_echo "*** CoreAudio output plugin disabled per user request ***" >&6; }
+fi
+
+
 
+# Check whether --with-ffmpeg was given.
+if test "${with_ffmpeg+set}" = set; then :
+  withval=$with_ffmpeg; ffmpeg_variant=$withval
+else
+  ffmpeg_variant=ffmpeg
 fi
 
 
-have_writer_flac=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_flac" != "xno"; then
+if test $ffmpeg_variant = ffmpeg ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
-$as_echo_n "checking for FLAC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
+$as_echo_n "checking for FFMPEG... " >&6; }
 
-if test -n "$FLAC_CFLAGS"; then
-    pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
+if test -n "$FFMPEG_CFLAGS"; then
+    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.1.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "flac >= 1.1.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.1.3" 2>/dev/null`
+  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13035,16 +13577,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$FLAC_LIBS"; then
-    pkg_cv_FLAC_LIBS="$FLAC_LIBS"
+if test -n "$FFMPEG_LIBS"; then
+    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.1.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "flac >= 1.1.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.1.3" 2>/dev/null`
+  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13065,68 +13607,44 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.1.3" 2>&1`
+	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0" 2>&1`
         else
-	        FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.1.3" 2>&1`
+	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$FLAC_PKG_ERRORS" >&5
-
-	if test "x$enable_filewriter_flac" = "xyes"; then
-            as_fn_error $? "Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again" "$LINENO" 5
-         fi
+	echo "$FFMPEG_PKG_ERRORS" >&5
 
+	as_fn_error $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.25.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_filewriter_flac" = "xyes"; then
-            as_fn_error $? "Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again" "$LINENO" 5
-         fi
-
+	as_fn_error $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.25.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$LINENO" 5
 else
-	FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS
-	FLAC_LIBS=$pkg_cv_FLAC_LIBS
+	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
+	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_writer_flac=yes
-
-$as_echo "#define FILEWRITER_FLAC 1" >>confdefs.h
-
-         FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $FLAC_CFLAGS"
-         FILEWRITER_LIBS="$FILEWRITER_LIBS $FLAC_LIBS"
-fi
-fi
-
-
-
-
+	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 
-# Check whether --enable-bs2b was given.
-if test "${enable_bs2b+set}" = set; then :
-  enableval=$enable_bs2b; enable_bs2b=$enableval
-else
-  enable_bs2b=auto
+$as_echo "#define HAVE_FFMPEG 1" >>confdefs.h
 
 fi
-
-
-have_bs2b=no
-if test "x$enable_bs2b" != "xno"; then
+elif test $ffmpeg_variant = libav ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BS2B" >&5
-$as_echo_n "checking for BS2B... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
+$as_echo_n "checking for FFMPEG... " >&6; }
 
-if test -n "$BS2B_CFLAGS"; then
-    pkg_cv_BS2B_CFLAGS="$BS2B_CFLAGS"
+if test -n "$FFMPEG_CFLAGS"; then
+    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_BS2B_CFLAGS=`$PKG_CONFIG --cflags "libbs2b >= 3.0.0" 2>/dev/null`
+  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13134,16 +13652,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$BS2B_LIBS"; then
-    pkg_cv_BS2B_LIBS="$BS2B_LIBS"
+if test -n "$FFMPEG_LIBS"; then
+    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_BS2B_LIBS=`$PKG_CONFIG --libs "libbs2b >= 3.0.0" 2>/dev/null`
+  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13164,64 +13682,57 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        BS2B_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0" 2>&1`
         else
-	        BS2B_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$BS2B_PKG_ERRORS" >&5
-
-	if test "x$enable_bs2b" = "xyes"; then
-            as_fn_error $? "Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again" "$LINENO" 5
-         fi
+	echo "$FFMPEG_PKG_ERRORS" >&5
 
+	as_fn_error $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.17.0, libavutil 51.18.0)." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_bs2b" = "xyes"; then
-            as_fn_error $? "Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again" "$LINENO" 5
-         fi
-
+	as_fn_error $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.17.0, libavutil 51.18.0)." "$LINENO" 5
 else
-	BS2B_CFLAGS=$pkg_cv_BS2B_CFLAGS
-	BS2B_LIBS=$pkg_cv_BS2B_LIBS
+	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
+	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_bs2b=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
+	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
+
+$as_echo "#define HAVE_LIBAV 1" >>confdefs.h
+
 fi
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** BS2B effect plugin disabled per user request ***" >&5
-$as_echo "*** BS2B effect plugin disabled per user request ***" >&6; }
 fi
 
 
-# Check whether --enable-resample was given.
-if test "${enable_resample+set}" = set; then :
-  enableval=$enable_resample; enable_resample=$enableval
-else
-  enable_resample=auto
 
+# Check whether --with-libsdl was given.
+if test "${with_libsdl+set}" = set; then :
+  withval=$with_libsdl; with_libsdl=$withval
+else
+  with_libsdl=auto
 fi
 
 
-have_resample=no
-if test "x$enable_resample" != "xno"; then
+test_sdlout () {
+    if test "x$with_libsdl" = "x1"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
 
-if test -n "$SAMPLERATE_CFLAGS"; then
-    pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
+if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13229,16 +13740,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SAMPLERATE_LIBS"; then
-    pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
+if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13259,60 +13770,41 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
         else
-	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SAMPLERATE_PKG_ERRORS" >&5
-
-	if test "x$enable_resample" = "xyes"; then
-            as_fn_error $? "Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
-         fi
+	echo "$SDL_PKG_ERRORS" >&5
 
+	have_sdlout=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_resample" = "xyes"; then
-            as_fn_error $? "Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
-         fi
-
+	have_sdlout=no
 else
-	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
-	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_resample=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
-fi
-fi
-
-
-# Check whether --enable-speedpitch was given.
-if test "${enable_speedpitch+set}" = set; then :
-  enableval=$enable_speedpitch; enable_speedpitch="$enableval"
-else
-  enable_speedpitch=auto
+	have_sdlout=yes
 fi
-
-
-have_speedpitch=no
-if test "x$enable_speedpitch" != "xno"; then
+    elif test "x$with_libsdl" = "x2"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
 
-if test -n "$SAMPLERATE_CFLAGS"; then
-    pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
+if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13320,16 +13812,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SAMPLERATE_LIBS"; then
-    pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
+if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13350,61 +13842,101 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
         else
-	        SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SAMPLERATE_PKG_ERRORS" >&5
-
-	if test "x$enable_speedpitch" = "xyes"; then
-            as_fn_error $? "Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
-         fi
+	echo "$SDL_PKG_ERRORS" >&5
 
+	have_sdlout=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_speedpitch" = "xyes"; then
-            as_fn_error $? "Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
-         fi
-
+	have_sdlout=no
 else
-	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
-	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_speedpitch=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"
-fi
+	have_sdlout=yes
 fi
+    else
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
 
-# Check whether --enable-soxr was given.
-if test "${enable_soxr+set}" = set; then :
-  enableval=$enable_soxr; enable_soxr=$enableval
+if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= 2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  enable_soxr=auto
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= 2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
 
+
+
+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
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
+        else
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SDL_PKG_ERRORS" >&5
 
 
-have_soxr=no
-if test "x$enable_soxr" != "xno"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5
-$as_echo_n "checking for SOXR... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
 
-if test -n "$SOXR_CFLAGS"; then
-    pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS"
+if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr" 2>/dev/null`
+  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13412,16 +13944,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$SOXR_LIBS"; then
-    pkg_cv_SOXR_LIBS="$SOXR_LIBS"
+if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr" 2>/dev/null`
+  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13442,141 +13974,174 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
         else
-	        SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr" 2>&1`
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$SOXR_PKG_ERRORS" >&5
-
-	if test "x$enable_soxr" = "xyes"; then
-            as_fn_error $? "Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again" "$LINENO" 5
-         fi
+	echo "$SDL_PKG_ERRORS" >&5
 
+	have_sdlout=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "x$enable_soxr" = "xyes"; then
-            as_fn_error $? "Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again" "$LINENO" 5
-         fi
-
+	have_sdlout=no
 else
-	SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS
-	SOXR_LIBS=$pkg_cv_SOXR_LIBS
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_soxr=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS sox-resampler"
-fi
+	have_sdlout=yes
 fi
 
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-# Check whether --enable-glspectrum was given.
-if test "${enable_glspectrum+set}" = set; then :
-  enableval=$enable_glspectrum; enable_glspectrum=$enableval
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
+
+if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  enable_glspectrum=auto
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
 
-have_glspectrum=no
 
-if test $enable_glspectrum = yes -a $USE_GTK != yes ; then
-    as_fn_error $? "--enable-glspectrum cannot be used without --enable-gtk" "$LINENO" 5
-fi
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-if test $enable_glspectrum != no -a $USE_GTK = yes ; then
-    if test $HAVE_MSWINDOWS = yes ; then
-        have_glspectrum=yes
-        GL_LIBS="-lopengl32"
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
-$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
-if ${ac_cv_lib_GL_glXCreateContext+:} false; then :
-  $as_echo_n "(cached) " >&6
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+        else
+	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SDL_PKG_ERRORS" >&5
 
-/* 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 glXCreateContext ();
-int
-main ()
-{
-return glXCreateContext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glXCreateContext=yes
+	have_sdlout=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_sdlout=no
 else
-  ac_cv_lib_GL_glXCreateContext=no
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_sdlout=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+else
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_sdlout=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
-$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
-if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
-  have_glspectrum=yes
+    fi
+}
+
+
+    # Check whether --enable-sdlout was given.
+if test "${enable_sdlout+set}" = set; then :
+  enableval=$enable_sdlout; enable_sdlout=$enableval
 else
-  have_glspectrum=no
+  enable_sdlout=auto
 fi
 
-        if test $have_glspectrum = yes ; then
-            GL_LIBS="-lGL -lX11"
-        fi
-    fi
 
-    if test $enable_glspectrum = yes && test $have_glspectrum = no ; then
-        as_fn_error $? "Unable to enable OpenGL Spectrum Analyzer; check config.log" "$LINENO" 5
+    have_sdlout=no
+    check_allowed sdlout $enable_sdlout
+    if test $enable_sdlout != no -a $plugin_allowed = yes ; then
+        test_sdlout
+        if test $have_sdlout = yes ; then
+            OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+        elif test $enable_sdlout = yes ; then
+            as_fn_error $? "Missing dependency for SDL Output" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL Output disabled due to missing dependency" >&5
+$as_echo "$as_me: WARNING: SDL Output disabled due to missing dependency" >&2;}
+        fi
     fi
 
-    if test $have_glspectrum = yes ; then
-        VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"
-    fi
-fi
 
 
+if test "x$OUTPUT_PLUGINS" = "x" ; then
+    as_fn_error $? "No output plugin was enabled.  Please install the necessary packages for your system and run configure again." "$LINENO" 5
+fi
 
 
-# Check whether --enable-qtglspectrum was given.
-if test "${enable_qtglspectrum+set}" = set; then :
-  enableval=$enable_qtglspectrum; enable_qtglspectrum=$enableval
+# Check whether --enable-filewriter was given.
+if test "${enable_filewriter+set}" = set; then :
+  enableval=$enable_filewriter; enable_filewriter=$enableval
 else
-  enable_qtglspectrum=auto
+  enable_filewriter=yes
+
 fi
 
 
-have_qtglspectrum=no
+if test "x$enable_filewriter" != "xno"; then
+    OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
+fi
+
+# Check whether --enable-filewriter_mp3 was given.
+if test "${enable_filewriter_mp3+set}" = set; then :
+  enableval=$enable_filewriter_mp3; enable_filewriter_mp3=$enableval
+else
+  enable_filewriter_mp3=auto
 
-if test "x$USE_QT" = "xno" -a "x$enable_qtglspectrum" = "xyes"; then
-    as_fn_error $? "--enable-qtglspectrum cannot be used without --enable-qt" "$LINENO" 5
 fi
 
-if test "x$USE_QT" = "xyes" -a "x$enable_qtglspectrum" != "xno"; then
-    if test $have_glspectrum = yes ; then
-        have_qtglspectrum=yes
-    elif test $HAVE_MSWINDOWS = yes ; then
-        have_qtglspectrum=yes
-        GL_LIBS="-lopengl32"
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5
-$as_echo_n "checking for glBegin in -lGL... " >&6; }
-if ${ac_cv_lib_GL_glBegin+:} false; then :
+
+have_lame=no
+if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_get_id3v2_tag in -lmp3lame" >&5
+$as_echo_n "checking for lame_get_id3v2_tag in -lmp3lame... " >&6; }
+if ${ac_cv_lib_mp3lame_lame_get_id3v2_tag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+LIBS="-lmp3lame -lm
+     $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13586,120 +14151,61 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char glBegin ();
+char lame_get_id3v2_tag ();
 int
 main ()
 {
-return glBegin ();
+return lame_get_id3v2_tag ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glBegin=yes
+  ac_cv_lib_mp3lame_lame_get_id3v2_tag=yes
 else
-  ac_cv_lib_GL_glBegin=no
+  ac_cv_lib_mp3lame_lame_get_id3v2_tag=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_GL_glBegin" >&5
-$as_echo "$ac_cv_lib_GL_glBegin" >&6; }
-if test "x$ac_cv_lib_GL_glBegin" = xyes; then :
-  have_qtglspectrum=yes
-else
-  have_qtglspectrum=no
-fi
-
-        if test $have_qtglspectrum = yes ; then
-            GL_LIBS="-lGL"
-        fi
-    fi
-
-    if test "x$have_qtglspectrum" = "xyes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame_lame_get_id3v2_tag" >&5
+$as_echo "$ac_cv_lib_mp3lame_lame_get_id3v2_tag" >&6; }
+if test "x$ac_cv_lib_mp3lame_lame_get_id3v2_tag" = xyes; then :
+  have_lame=yes
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTOPENGL" >&5
-$as_echo_n "checking for QTOPENGL... " >&6; }
+$as_echo "#define FILEWRITER_MP3 1" >>confdefs.h
 
-if test -n "$QTOPENGL_CFLAGS"; then
-    pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5OpenGL\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_QTOPENGL_CFLAGS=`$PKG_CONFIG --cflags "Qt5OpenGL" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$QTOPENGL_LIBS"; then
-    pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5OpenGL\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs "Qt5OpenGL" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+         FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
 else
-  pkg_failed=yes
+  if test "x$enable_filewriter_mp3" = "xyes"; then
+            as_fn_error $? "Cannot find lame development files, but compilation of FileWriter MP3 output part has been explicitly requested; please install lame dev files and run configure again" "$LINENO" 5
+         fi
 fi
- else
-    pkg_failed=untried
+
 fi
 
 
+if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+$as_echo "#define FILEWRITER_VORBIS 1" >>confdefs.h
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
+    FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
+    FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
-        else
-	        QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$QTOPENGL_PKG_ERRORS" >&5
 
-	have_qtglspectrum=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_qtglspectrum=no
-else
-	QTOPENGL_CFLAGS=$pkg_cv_QTOPENGL_CFLAGS
-	QTOPENGL_LIBS=$pkg_cv_QTOPENGL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_qtglspectrum=yes
-fi
-    fi
+if test "x$enable_filewriter" = "xyes" -a "x$have_flac" != "xyes"; then
 
-    if test "x$have_qtglspectrum" = "xyes"; then
-        QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
-        VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum-qt"
-    elif test "x$enable_qtglspectrum" = "xyes"; then
-        as_fn_error $? "Qt OpenGL Spectrum Analyzer could not be enabled; check config.log" "$LINENO" 5
-    fi
+$as_echo "#define FILEWRITER_FLAC 1" >>confdefs.h
+
+    FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $LIBFLAC_CFLAGS"
+    FILEWRITER_LIBS="$FILEWRITER_LIBS $LIBFLAC_LIBS"
 fi
 
 
+
+
+
 # Check whether --enable-mac_media_keys was given.
 if test "${enable_mac_media_keys+set}" = set; then :
   enableval=$enable_mac_media_keys; enable_mac_media_keys=$enableval
@@ -14381,7 +14887,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 audacious-plugins $as_me 3.7.2, which was
+This file was extended by audacious-plugins $as_me 3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14447,7 +14953,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="\\
-audacious-plugins config.status 3.7.2
+audacious-plugins config.status 3.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15314,110 +15820,134 @@ echo "Configuration:"
 echo
 echo "  Install path:                           $plugindir"
 echo
-echo "  Output Plugins"
-echo "  --------------"
-echo "  Open Sound System (oss4):               $have_oss4"
-echo "  Advanced Linux Sound Arch. (alsa):      $have_alsa"
-echo "  Sndio (sndio):                          $have_sndio"
-echo "  CoreAudio (coreaudio):                  $have_coreaudio"
-echo "  PulseAudio (pulse):                     $have_pulse"
-echo "  Jack Audio Connection Kit (jack):       $have_jack"
-echo "  Simple DirectMedia Layer (sdlout):      $have_sdlout"
-echo "  Qt Multimedia (qtaudio):                $have_qtaudio"
-echo "  FileWriter:                             $have_filewriter"
-echo "    -> FileWriter MP3 output part:        $have_lame"
-echo "    -> FileWriter Vorbis output part:     $have_vorbisenc"
-echo "    -> FileWriter FLAC output part:       $have_writer_flac"
+echo "  GTK+ support:                           $USE_GTK"
+echo "  Qt support:                             $USE_QT"
 echo
-echo "  Input Plugins"
+echo "  Audio Formats"
 echo "  -------------"
-echo "  MPEG-1 Layer I/II/III (mpg123):         $enable_mp3"
-echo "  MPEG-2/4 AAC (aac):                     $enable_aac"
-echo "  FFaudio (ffaudio):                      $ffmpeg_variant"
-echo "  Module decoder (modplug):               $have_modplug"
-echo "  MIDI synthesizer (amidi-plug):          $have_amidiplug"
-echo "  CD Digital Audio (cdaudio_ng):          $have_cdaudio_ng"
-echo "  sndfile extensions:                     $have_sndfile"
-echo "  Tone Generator:                         yes"
-echo "  Ogg Vorbis (vorbis):                    $enable_vorbis"
-echo "  Free Lossless Audio Codec (flacng):     $enable_flacng"
-echo "  Commodore 64 audio (SID):               $have_sidplay"
-echo "  Game music (spc, nsf & gbs):            $have_console"
-echo "  PlayStation (psf/psf2) audio:           yes"
-echo "  Nintendo DS audio (xsf):                yes"
+echo "  Audio CD:                               $have_cdaudio"
+echo "  Free Lossless Audio Codec:              $have_flac"
+echo "  Ogg Vorbis:                             $have_vorbis"
+echo "  MIDI (via FluidSynth):                  $have_amidiplug"
+echo "  MPEG-1 Layer I/II/III (via mpg123):     $have_mpg123"
+echo "  MPEG-2/4 AAC:                           $have_aac"
+echo "  WavPack:                                $have_wavpack"
+echo
+echo "  External Decoders"
+echo "  -----------------"
+echo "  FFmpeg/Libav:                           $ffmpeg_variant"
+echo "  libsndfile:                             $have_sndfile"
+echo
+echo "  Chiptunes"
+echo "  ---------"
 echo "  AdLib synthesizer (adplug):             yes"
-echo "  WavPack 4.31+ (wavpack):                $have_wavpack"
-echo "  Metronom:                               yes"
-echo "  VTX Decoder:                            yes"
+echo "  Commodore 64 audio (sid):               $have_sid"
+echo "  Game Music Emu (spc, nsf, gbs, etc.):   $have_console"
+echo "  ModPlug:                                $have_modplug"
+echo "  Nintendo DS audio (xsf):                yes"
+echo "  PlayStation audio (psf/psf2):           yes"
+echo "  Vortex Tracker (vtx):                   yes"
 echo
-echo "  General"
-echo "  -------"
-echo "  Alarm:                                  $USE_GTK"
-echo "  Album Art:                              $USE_GTK"
-echo "  Album Art (Qt):                         $USE_QT"
-echo "  Delete from Filesystem:                 $USE_GTK"
-echo "  Linux Infrared Remote Control (LIRC)    $have_lirc"
-echo "  MPRIS 2 Server:                         $have_mpris2"
-echo "  Playlist Manager:                       $USE_GTK"
-echo "  Playlist Manager (Qt):                  $USE_QT"
-echo "  Search Tool:                            $USE_GTK"
-echo "  Search Tool (Qt):                       $USE_QT"
-echo "  Song Change:                            $have_songchange"
-echo "  Song Info (Qt):                         $USE_QT"
-echo "  Status Icon:                            $USE_GTK"
-echo "  Status Icon (Qt):                       $USE_QT"
-echo "  Audacious OSD:                          $have_aosd"
-echo "    -> X Composite support:               $have_aosd_xcomp"
-echo "  libnotify OSD:                          $have_notify"
-echo "  Global Hotkey Plugin:                   $have_hotkey"
-echo "  Gnome Shortcuts Plugin:                 $have_gnomeshortcuts"
-echo "  Scrobbler 2.0:                          $have_scrobbler2"
-echo "  LyricWiki viewer:                       $USE_GTK"
-echo "  LyricWiki viewer (Qt):                  $USE_QT"
-echo "  Mac Media Keys:                         $enable_mac_media_keys"
+echo "  Other Inputs"
+echo "  ------------"
+echo "  Metronome:                              yes"
+echo "  Tone Generator:                         yes"
 echo
-echo "  Effect"
-echo "  ------"
+echo "  Effects"
+echo "  -------"
+echo "  Bauer stereophonic-to-binaural (bs2b):  $have_bs2b"
 echo "  Channel Mixer:                          yes"
 echo "  Crystalizer:                            yes"
 echo "  Dynamic Range Compressor:               yes"
 echo "  Echo/Surround:                          yes"
 echo "  Extra Stereo:                           yes"
-echo "  LADSPA Host:                            $USE_GTK"
-echo "  Voice Removal:                          yes"
-echo "  Bauer stereophonic-to-binaural (bs2b):  $have_bs2b"
-echo "  Sample Rate Converter (resample):       $have_resample"
+echo "  LADSPA Host (requires GTK+):            $USE_GTK"
+echo "  Sample Rate Converter:                  $have_resample"
 echo "  Silence Removal:                        yes"
-echo "  Speed and Pitch:                        $have_speedpitch"
 echo "  SoX Resampler:                          $have_soxr"
+echo "  Speed and Pitch:                        $have_speedpitch"
+echo "  Voice Removal:                          yes"
 echo
-echo "  Visualization"
-echo "  -------------"
-echo "  Blur Scope:                             $USE_GTK"
-echo "  Cairo Spectrum Analyzer:                $USE_GTK"
-echo "  GTK+ OpenGL Spectrum Analyzer:          $have_glspectrum"
-echo "  Qt OpenGL Spectrum Analyzer:            $have_qtglspectrum"
-echo
-echo "  Transport"
-echo "  ---------"
-echo "  neon-based http/https:                  $enable_neon"
-echo "  libmms-based mms:                       $have_mms"
-echo "  GIO:                                    yes"
+echo "  Outputs"
+echo "  -------"
+echo "  Advanced Linux Sound Architecture:      $have_alsa"
+echo "  Jack Audio Connection Kit:              $have_jack"
+echo "  Open Sound System:                      $have_oss4"
+echo "  PulseAudio:                             $have_pulse"
+echo "  Simple DirectMedia Layer:               $have_sdlout"
+echo "  Sndio:                                  $have_sndio"
+echo "  Win32 waveOut:                          $HAVE_MSWINDOWS"
+echo "  FileWriter:                             $enable_filewriter"
+echo "    -> MP3 encoding:                      $have_lame"
+echo "    -> Vorbis encoding:                   $have_vorbis"
+echo "    -> FLAC encoding:                     $have_flac"
 echo
-echo "  Container"
+echo "  Playlists"
 echo "  ---------"
-echo "  Audacious playlist format (audpl):      yes"
-echo "  Winamp PLS playlist format (pls):       yes"
-echo "  M3U playlist format (m3u):              yes"
+echo "  Cue sheets:                             $have_cue"
+echo "  M3U playlists:                          yes"
 echo "  Microsoft ASX (legacy):                 yes"
 echo "  Microsoft ASX 3.0:                      yes"
-echo "  XML Sharable Playlist Format (xspf):    yes"
-echo "  CUE playlist format (cue):              $have_cue"
+echo "  PLS playlists:                          yes"
+echo "  XML Sharable Playlist Format (XSPF):    yes"
 echo
-echo "  Interfaces"
+echo "  Transports"
 echo "  ----------"
-echo "  GTK (gtkui):                            $USE_GTK"
-echo "  Qt (qtui):                              $USE_QT"
-echo "  Winamp Classic (skins):                 $USE_GTK"
-echo "  Winamp Classic (skins, Qt):             $USE_QT"
+echo "  FTP, SFTP, SMB (via GIO):               yes"
+echo "  HTTP/HTTPS (via neon):                  $have_neon"
+echo "  MMS (via libmms):                       $have_mms"
+echo
+echo "  General"
+echo "  -------"
+echo "  Alarm (requires GTK+):                  $USE_GTK"
+echo "  Ampache browser (requires Qt):          $have_ampache"
+echo "  Delete Files:                           $USE_GTK_OR_QT"
+echo "  GNOME Shortcuts:                        $have_gnomeshortcuts"
+echo "  libnotify OSD:                          $have_notify"
+echo "  Linux Infrared Remote Control (LIRC):   $have_lirc"
+echo "  MPRIS 2 Server:                         $have_mpris2"
+echo "  Scrobbler 2.0:                          $have_scrobbler2"
+echo "  Song Change:                            $have_songchange"
 echo
+
+if test "x$USE_GTK" = "xyes" ; then
+    echo "  GTK+ Support"
+    echo "  ------------"
+    echo "  GTK Interface:                          yes"
+    echo "  Winamp Classic Interface:               yes"
+    echo "  Album Art:                              yes"
+    echo "  Blur Scope:                             yes"
+    echo "  OpenGL Spectrum Analyzer:               $have_glspectrum"
+    echo "  LyricWiki viewer:                       yes"
+    echo "  Playlist Manager:                       yes"
+    echo "  Search Tool:                            yes"
+    echo "  Spectrum Analyzer (2D):                 yes"
+    echo "  Status Icon:                            yes"
+    echo "  X11 Global Hotkeys:                     $have_hotkey"
+    echo "  X11 On-Screen Display (aosd):           $have_aosd"
+    echo
+fi
+
+if test "x$USE_QT" = "xyes" ; then
+    echo "  Qt Support"
+    echo "  ----------"
+    echo "  Qt Multimedia output:                   $have_qtaudio"
+    echo "  Qt Interface:                           yes"
+    echo "  Winamp Classic Interface:               yes"
+    echo "  Album Art:                              yes"
+    echo "  LyricWiki viewer:                       yes"
+    echo "  OpenGL Spectrum Analyzer:               $have_qtglspectrum"
+    echo "  Playlist Manager:                       yes"
+    echo "  Search Tool:                            yes"
+    echo "  Song Info:                              yes"
+    echo "  Status Icon:                            yes"
+    echo
+fi
+
+if test "x$HAVE_DARWIN" = "xyes" ; then
+    echo "  Mac OS X Support"
+    echo "  ----------------"
+    echo "  CoreAudio output:                       $have_coreaudio"
+    echo "  Media Keys:                             $enable_mac_media_keys"
+    echo
+fi
diff --git a/configure.ac b/configure.ac
index be624cd..b52c0d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl ***
 dnl Initialize
 dnl ==========
 AC_PREREQ([2.59])
-AC_INIT([audacious-plugins], [3.7.2])
+AC_INIT([audacious-plugins], [3.8])
 AC_COPYRIGHT([Copyright (C) 2001-2016 Audacious developers and others])
 
 AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE_NAME", [Name of package])
@@ -31,9 +31,9 @@ LIBS="$LIBS $LIBINTL"
 dnl Check for Audacious
 dnl ===================
 
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.7],
+PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.8],
     [],
-    [AC_MSG_ERROR([Cannot find Audacious 3.7; have you installed Audacious yet?])]
+    [AC_MSG_ERROR([Cannot find Audacious 3.8; have you installed Audacious yet?])]
 )
 
 CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@@ -73,7 +73,7 @@ TRANSPORT_PLUGINS="gio"
 
 if test "x$USE_GTK" = "xyes" ; then
     EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
-    GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart delete-files lyricwiki playlist-manager search-tool statusicon"
+    GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart lyricwiki playlist-manager search-tool statusicon"
     GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui skins"
     VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope cairo-spectrum"
 fi
@@ -83,46 +83,419 @@ if test "x$USE_QT" = "xyes" ; then
     GENERAL_PLUGINS="$GENERAL_PLUGINS qtui skins-qt"
 fi
 
+USE_GTK_OR_QT=no
 if test "x$USE_GTK" = "xyes" -o "x$USE_QT" = "xyes" ; then
-    GENERAL_PLUGINS="$GENERAL_PLUGINS skins-data"
-fi
+    USE_GTK_OR_QT=yes
+    GENERAL_PLUGINS="$GENERAL_PLUGINS delete-files skins-data"
+fi
+
+if test $HAVE_MSWINDOWS = yes ; then
+    OUTPUT_PLUGINS="$OUTPUT_PLUGINS waveout"
+fi
+
+check_allowed () {
+    case $1 in
+        glspectrum|hotkey|aosd)
+            plugin_allowed=$USE_GTK
+            if test $plugin_allowed = no -a $2 = yes ; then
+                AC_MSG_ERROR([--enable-$1 cannot be used without --enable-gtk])
+            fi
+            ;;
+        ampache|qtaudio|qtglspectrum)
+            plugin_allowed=$USE_QT
+            if test $plugin_allowed = no -a $2 = yes ; then
+                AC_MSG_ERROR([--enable-$1 cannot be used without --enable-qt])
+            fi
+            ;;
+        *)
+            plugin_allowed=yes
+            ;;
+    esac
+}
+
+dnl Enable/disable plugin with pkg-config dependency
+dnl ================================================
+dnl $1 = short name of plugin (e.g. pulse)
+dnl $2 = long name of plugin (e.g. PulseAudio output plugin)
+dnl $3 = enabled by default (auto/yes/no)
+dnl $4 = type of plugin (e.g. OUTPUT)
+dnl $5 = CFLAGS/LIBS prefix (e.g. PULSE)
+dnl $6 = dependency (e.g. libpulse >= 0.9.5)
+
+AC_DEFUN([ENABLE_PLUGIN_WITH_DEP], [
+    AC_ARG_ENABLE($1,
+        [AS_HELP_STRING([--enable-$1], [enable $2 (default=$3)])],
+        [enable_$1=$enableval],
+        [enable_$1=$3])
+
+    have_$1=no
+    check_allowed $1 $enable_$1
+    if test $enable_$1 != no -a $plugin_allowed = yes ; then
+        PKG_CHECK_MODULES($5, $6, [
+            have_$1=yes
+            $4_PLUGINS="$$4_PLUGINS $1"
+        ], [
+            if test $enable_$1 = yes ; then
+                AC_MSG_ERROR([Missing dependency for $2: $6])
+            else
+                AC_MSG_WARN([$2 disabled due to missing dependency: $6])
+            fi
+        ])
+    fi
+])
 
-dnl Console
-dnl =======
+dnl Enable/disable plugin, first calling test_<name>
+dnl ================================================
+dnl $1 = short name of plugin (e.g. pulse)
+dnl $2 = long name of plugin (e.g. PulseAudio output plugin)
+dnl $3 = enabled by default (auto/yes/no)
+dnl $4 = type of plugin (e.g. OUTPUT)
+
+AC_DEFUN([ENABLE_PLUGIN_WITH_TEST], [
+    AC_ARG_ENABLE($1,
+        [AS_HELP_STRING([--enable-$1], [enable $2 (default=$3)])],
+        [enable_$1=$enableval],
+        [enable_$1=$3])
+
+    have_$1=no
+    check_allowed $1 $enable_$1
+    if test $enable_$1 != no -a $plugin_allowed = yes ; then
+        test_$1
+        if test $have_$1 = yes ; then
+            $4_PLUGINS="$$4_PLUGINS $1"
+        elif test $enable_$1 = yes ; then
+            AC_MSG_ERROR([Missing dependency for $2])
+        else
+            AC_MSG_WARN([$2 disabled due to missing dependency])
+        fi
+    fi
+])
 
-AC_ARG_ENABLE(console,
- [AS_HELP_STRING([--disable-console], [disable game music decoder (console)])],
- [enable_console=$enableval], [enable_console=auto])
-
-have_console=no
-if test "x$enable_console" != "xno"; then
-    AC_CHECK_HEADERS([zlib.h],
-        [have_console=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS console"],
-        [if test "x$enable_console" = "xyes"; then
-            AC_MSG_ERROR([Cannot find zlib development files, but compilation of game music decoder (console) has been explicitly requested; please install zlib dev files and run configure again])
-         fi]
-    )
-fi
+dnl Optional Plugins
+dnl ================
+
+ENABLE_PLUGIN_WITH_DEP(cdaudio,
+    audio CD support,
+    auto,
+    INPUT,
+    CDIO,
+    libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1)
+
+if test $have_cdaudio = yes ; then
+    GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+fi
+
+ENABLE_PLUGIN_WITH_DEP(flac,
+    FLAC support,
+    yes,
+    INPUT,
+    LIBFLAC,
+    flac >= 1.2.1)
+
+ENABLE_PLUGIN_WITH_DEP(vorbis,
+    Ogg Vorbis support,
+    yes,
+    INPUT,
+    VORBIS,
+    ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0)
+
+ENABLE_PLUGIN_WITH_DEP(amidiplug,
+    MIDI synthesizer,
+    auto,
+    INPUT,
+    FLUIDSYNTH,
+    fluidsynth >= 1.0.6)
+
+ENABLE_PLUGIN_WITH_DEP(mpg123,
+    MP3 support,
+    yes,
+    INPUT,
+    MPG123,
+    libmpg123 >= 1.12)
+
+test_aac () {
+    AC_CHECK_HEADER(neaacdec.h, have_aac=yes, have_aac=no)
+    AC_CHECK_LIB(faad, NeAACDecInit2, true, have_aac=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(aac,
+    AAC support,
+    auto,
+    INPUT)
+
+ENABLE_PLUGIN_WITH_DEP(wavpack,
+    WavPack support,
+    yes,
+    INPUT,
+    WAVPACK,
+    wavpack >= 4.31)
+
+ENABLE_PLUGIN_WITH_DEP(sndfile,
+    libsndfile decoder,
+    auto,
+    INPUT,
+    SNDFILE,
+    sndfile >= 0.19)
+
+ENABLE_PLUGIN_WITH_DEP(modplug,
+    ModPlug,
+    auto,
+    INPUT,
+    MODPLUG,
+    libmodplug)
+
+ENABLE_PLUGIN_WITH_DEP(sid,
+    Commodore 64 audio,
+    auto,
+    INPUT,
+    SIDPLAYFP,
+    libsidplayfp >= 1.0)
+
+test_console () {
+    AC_CHECK_HEADERS(zlib.h, have_console=yes, have_console=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(console,
+    Game Music Emu,
+    auto,
+    INPUT)
+
+ENABLE_PLUGIN_WITH_DEP(bs2b,
+    BS2B effect,
+    auto,
+    EFFECT,
+    BS2B,
+    libbs2b >= 3.0.0)
+
+ENABLE_PLUGIN_WITH_DEP(resample,
+    sample rate converter,
+    auto,
+    EFFECT,
+    SAMPLERATE,
+    samplerate)
+
+ENABLE_PLUGIN_WITH_DEP(speedpitch,
+    speed/pitch effect,
+    auto,
+    EFFECT,
+    SAMPLERATE,
+    samplerate)
+
+ENABLE_PLUGIN_WITH_DEP(soxr,
+    SoX resampler,
+    auto,
+    EFFECT,
+    SOXR,
+    soxr)
+
+ENABLE_PLUGIN_WITH_DEP(alsa,
+    ALSA output,
+    auto,
+    OUTPUT,
+    ALSA,
+    alsa >= 1.0.16)
+
+test_jack () {
+    PKG_CHECK_MODULES(JACK, jack >= 1.9.7, have_jack=yes, [
+        PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0, have_jack=yes, have_jack=no)
+    ])
+}
+
+ENABLE_PLUGIN_WITH_TEST(jack,
+    JACK output,
+    auto,
+    OUTPUT)
+
+test_oss4 () {
+    OSS_CFLAGS=
+    if test -f "/etc/oss.conf"; then
+        . "/etc/oss.conf"
+        OSS_CFLAGS="-I$OSSLIBDIR/include"
+    fi
+    AC_SUBST(OSS_CFLAGS)
 
-dnl QtAudio
-dnl =======
+    OLD_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
+    have_oss4=no
+    AC_CHECK_HEADERS(sys/soundcard.h soundcard.h, [
+        have_oss4=yes
+        break
+    ])
+    CPPFLAGS="$OLD_CPPFLAGS"
+}
+
+ENABLE_PLUGIN_WITH_TEST(oss4,
+    OSS output,
+    auto,
+    OUTPUT)
+
+ENABLE_PLUGIN_WITH_DEP(pulse,
+    PulseAudio output,
+    auto,
+    OUTPUT,
+    PULSE,
+    libpulse >= 0.9.5)
+
+test_sndio () {
+    AC_CHECK_LIB(sndio, sio_open, have_sndio=yes, have_sndio=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(sndio,
+    Sndio output,
+    auto,
+    OUTPUT)
+
+test_cue () {
+    PKG_CHECK_MODULES(CUE, libcue >= 2.0, [
+        AC_DEFINE(HAVE_LIBCUE2, 1, [Define if libcue version is >= 2.0])
+        have_cue=yes
+    ], [
+        PKG_CHECK_MODULES(CUE, libcue, have_cue=yes, have_cue=no)
+    ])
+}
+
+ENABLE_PLUGIN_WITH_TEST(cue,
+    cue sheet support,
+    auto,
+    CONTAINER)
+
+ENABLE_PLUGIN_WITH_DEP(neon,
+    HTTP/HTTPS transport,
+    yes,
+    TRANSPORT,
+    NEON,
+    neon >= 0.27)
+
+ENABLE_PLUGIN_WITH_DEP(mms,
+    MMS transport,
+    auto,
+    TRANSPORT,
+    MMS,
+    libmms >= 0.3)
+
+ENABLE_PLUGIN_WITH_DEP(gnomeshortcuts,
+    GNOME shortcuts,
+    auto,
+    GENERAL,
+    DBUS,
+    dbus-1 >= 0.60 dbus-glib-1 >= 0.60)
+
+ENABLE_PLUGIN_WITH_DEP(notify,
+    libnotify OSD,
+    auto,
+    GENERAL,
+    NOTIFY,
+    libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26)
+
+test_lirc () {
+    AC_CHECK_HEADERS(lirc/lirc_client.h, have_lirc=yes, have_lirc=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(lirc,
+    LIRC support,
+    auto,
+    GENERAL)
+
+test_mpris2 () {
+    unset have_mpris2
+    AC_CHECK_PROG(have_mpris2, gdbus-codegen, yes, no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(mpris2,
+    MPRIS 2 server,
+    auto,
+    GENERAL)
+
+test_songchange () {
+    AC_CHECK_HEADERS(sys/wait.h, have_songchange=yes, have_songchange=no)
+}
 
-AC_ARG_ENABLE(qtaudio,
-    [AS_HELP_STRING([--disable-qtaudio], [disable QtMultimedia output plugin (default=enabled)])],
-    [enable_qtaudio=$enableval],
-    [enable_qtaudio=auto])
-
-have_qtaudio=no
-if test "x$enable_qtaudio" = "xyes" -o \( "x$USE_QT" = "xyes" -a "x$enable_qtaudio" = "xauto" \); then
-    PKG_CHECK_MODULES(QTMULTIMEDIA, [Qt5Multimedia], [have_qtaudio=yes], [have_qtaudio=no])
-    if test "x$have_qtaudio" = "xyes"; then
-        QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS -fPIC"
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
-    elif test "x$enable_qtaudio" = "xyes"; then
-        AC_MSG_ERROR([QtAudio output plugin requested but QtMultimedia not found!])
+ENABLE_PLUGIN_WITH_TEST(songchange,
+    song change plugin,
+    auto,
+    GENERAL)
+
+dnl Optional plugins (GTK-only)
+dnl ===========================
+
+ENABLE_PLUGIN_WITH_DEP(scrobbler2,
+    Scrobbler 2,
+    auto,
+    GENERAL,
+    CURL,
+    libcurl >= 7.9.7)
+
+test_glspectrum () {
+    if test $HAVE_MSWINDOWS = yes ; then
+        have_glspectrum=yes
+        GL_LIBS="-lopengl32"
+    else
+        AC_CHECK_LIB(GL, glXCreateContext, [
+            have_glspectrum=yes
+            GL_LIBS="-lGL -lX11"
+        ], [have_glspectrum=no])
     fi
-fi
+    AC_SUBST(GL_LIBS)
+}
+
+ENABLE_PLUGIN_WITH_TEST(glspectrum,
+    OpenGL spectrum analyzer,
+    auto,
+    VISUALIZATION)
+
+ENABLE_PLUGIN_WITH_DEP(hotkey,
+    global hotkeys (X11),
+    auto,
+    GENERAL,
+    GDKX11,
+    gdk-x11-2.0)
+
+ENABLE_PLUGIN_WITH_DEP(aosd,
+    X11 OSD,
+    auto,
+    GENERAL,
+    X11EXT,
+    xrender xcomposite)
+
+dnl Optional plugins (Qt-only)
+dnl ==========================
+
+ENABLE_PLUGIN_WITH_DEP(ampache,
+    Ampache browser,
+    auto,
+    GENERAL,
+    AMPACHE,
+    ampache_browser_0)
+
+ENABLE_PLUGIN_WITH_DEP(qtaudio,
+    QtMultimedia output,
+    auto,
+    OUTPUT,
+    QTMULTIMEDIA,
+    Qt5Multimedia)
+
+test_qtglspectrum () {
+    PKG_CHECK_MODULES(QTOPENGL, Qt5OpenGL, [
+        QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
+        if test $have_glspectrum = yes ; then
+            have_qtglspectrum=yes
+        elif test $HAVE_MSWINDOWS = yes ; then
+            have_qtglspectrum=yes
+            GL_LIBS="-lopengl32"
+        else
+            AC_CHECK_LIB(GL, glBegin, [
+                have_qtglspectrum=yes
+                GL_LIBS="-lGL"
+            ], [have_qtglspectrum=no])
+        fi
+        AC_SUBST(GL_LIBS)
+    ], [have_qtglspectrum=no])
+}
+
+ENABLE_PLUGIN_WITH_TEST(qtglspectrum,
+    Qt OpenGL spectrum analyzer,
+    auto,
+    VISUALIZATION)
 
 dnl CoreAudio
 dnl =========
@@ -143,503 +516,47 @@ else
     AC_MSG_RESULT([*** CoreAudio output plugin disabled per user request ***])
 fi
 
-dnl PulseAudio
-dnl ==========
-
-AC_ARG_ENABLE( pulse,
-    [AS_HELP_STRING([--disable-pulse], [disable PulseAudio output plugin (default=enabled)])],
-    [enable_pulse=$enableval],
-    [enable_pulse=auto]
-)
-
-have_pulse=no
-if test "x$enable_pulse" != "xno"; then
-    PKG_CHECK_MODULES(PULSE, [libpulse >= 0.9.5],
-         [have_pulse=yes
-          OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"],
-         [if test "x$enable_pulse" = "xyes"; then
-             AC_MSG_ERROR([Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again])
-          fi]
-    )
-else
-    AC_MSG_RESULT([*** pulseaudio output plugin disabled per user request ***])
-fi
-
-dnl MP3 (enabled by default)
-dnl ========================
-
-AC_ARG_ENABLE(mp3,
- [AS_HELP_STRING([--disable-mp3], [disable MP3 support (default=enabled)])],
- [enable_mp3=$enableval], [enable_mp3=yes])
-
-if test $enable_mp3 = yes ; then
-    PKG_CHECK_MODULES(MPG123, [libmpg123 >= 1.12])
-    INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
-fi
-
-dnl *** Global Hotkey general plugin (only built on X11)
-
-AC_ARG_ENABLE(hotkey,
-    [AS_HELP_STRING([--disable-hotkey], [disable global hotkey plugin (default=enabled)])],
-    [enable_hotkey=$enableval],
-    [enable_hotkey=auto]
-)
-
-have_hotkey=no
-
-if test $enable_hotkey = yes -a $USE_GTK != yes ; then
-    AC_MSG_ERROR([--enable-hotkey cannot be used without --enable-gtk])
-fi
-
-if test $enable_hotkey != no -a $USE_GTK = yes ; then
-    PKG_CHECK_MODULES(GDKX11, [gdk-x11-2.0],
-        [have_hotkey="yes"
-         GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"],
-        [if test "x$enable_hotkey" = "xyes"; then
-            AC_MSG_ERROR([Cannot find gdk-x11-2.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-2.0 dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl *** Gnome Shortcuts Plugin
-
-AC_ARG_ENABLE(gnomeshortcuts,
-    [AS_HELP_STRING([--disable-gnomeshortcuts], [disable gnome shortcuts (default=enabled)])],
-    [enable_gnomeshortcuts=$enableval],
-    [enable_gnomeshortcuts=auto]
-)
-
-have_gnomeshortcuts=no
-if test "x$enable_gnomeshortcuts" != "xno"; then
-    PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60],
-     [have_gnomeshortcuts=yes
-      GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"],
-     [if test "x$enable_gnomeshortcuts" = "xyes"; then
-        AC_MSG_ERROR([Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again])
-      fi]
-    )
-else
-    AC_MSG_RESULT([*** Gnome Shortcuts Plugin disabled per user request ***])
-fi
-
-dnl Linux Infrared Remote Control (LIRC)
-dnl ====================================
-
-AC_ARG_ENABLE(lirc,
- [AS_HELP_STRING([--disable-lirc], [disable LIRC support (default=enabled)])],
- [enable_lirc=$enableval], [enable_lirc=auto])
-
-have_lirc=no
-if test "x$enable_lirc" != "xno"; then
-    AC_CHECK_HEADERS([lirc/lirc_client.h],
-        [have_lirc=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"],
-        [if test "x$enable_lirc" = "xyes"; then
-            AC_MSG_ERROR([Cannot find lirc development files, but compilation of LIRC support has been explicitly requested; please install lirc dev files and run configure again])
-         fi])
-fi
-
-dnl Song Change
-dnl ===========
-
-AC_ARG_ENABLE(songchange,
- [AS_HELP_STRING([--disable-songchange], [disable song change plugin])],
- [enable_songchange=$enableval], [enable_songchange=auto])
-
-have_songchange=no
-
-if test $enable_songchange != no ; then
-    AC_CHECK_HEADERS([sys/wait.h],
-        [have_songchange=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"],
-        [if test "x$enable_songchange" = "xyes"; then
-            AC_MSG_ERROR([Cannot find sys/wait.h header, but compilation of song change plugin has been explicitly requested])
-         fi]
-    )
-fi
-
-dnl *** Audacious OSD plugin (pangocairo-based)
-
-AC_ARG_ENABLE(aosd,
-    [AS_HELP_STRING([--disable-aosd], [disable Audacious OSD plugin (default=enabled)])],
-    [enable_aosd=$enableval],
-    [enable_aosd=auto]
-)
-
-have_aosd=no
-
-if test $enable_aosd = yes -a $USE_GTK != yes ; then
-    AC_MSG_ERROR([--enable-aosd cannot be used without --enable-gtk])
-fi
-
-if test $enable_aosd != no -a $USE_GTK = yes ; then
-    PKG_CHECK_MODULES(XRENDER, [xrender],
-        [have_aosd=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"],
-        [AC_MSG_RESULT([*** X Render extension is required for Audacious OSD plugin ***])]
-    )
-
-    if test "x$enable_aosd" = "xyes" -a "x$have_aosd" != "xyes"; then
-        AC_MSG_ERROR([Compilation of OSD plugin has been explicitly requested; please install required dev files and run configure again])
-    fi
-fi
-
-AC_ARG_ENABLE(aosd_xcomp,
-    [AS_HELP_STRING([--disable-aosd-xcomp], [disable Audacious OSD X Composite Support (default=enabled)])],
-    [enable_aosd_xcomp=$enableval],
-    [enable_aosd_xcomp=auto]
-)
-
-if test "x$have_aosd" != "xyes"; then
-    if test "x$enable_aosd_xcomp" = "xyes"; then
-        AC_MSG_ERROR([Cannot enable X Composite support for Audacious OSD plugin which is disabled])
-    else
-        enable_aosd_xcomp=no
-    fi
-fi
-
-have_aosd_xcomp=no
-if test "x$enable_aosd_xcomp" != "xno"; then
-    PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
-        [have_aosd_xcomp=yes
-         AC_DEFINE([HAVE_XCOMPOSITE],[],[X Composite extension available])],
-        [if test "x$enable_aosd_xcomp" = "xyes"; then
-            AC_MSG_ERROR([Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl notify: libnotify-based OSD
-dnl ===========================
-
-AC_ARG_ENABLE(notify,
- [AS_HELP_STRING([--disable-notify], [disable notify plugin (default=enabled)])],
- [enable_notify=$enableval], [enable_notify=auto])
-
-have_notify=no
-
-if test $enable_notify = yes -a $USE_GTK != yes ; then
-    AC_MSG_ERROR([--enable-notify cannot be used without --enable-gtk])
-fi
-
-if test $enable_notify != no -a $USE_GTK = yes ; then
-    PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.7],
-        [have_notify=yes
-         GENERAL_PLUGINS="$GENERAL_PLUGINS notify"],
-        [if test "x$enable_notify" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl MPRIS 2 (requires GDBus)
-dnl ========================
-
-AC_ARG_ENABLE(mpris2,
- AS_HELP_STRING(--disable-mpris2, [disable MPRIS 2 support (default=auto)]),
- enable_mpris2=$enableval, enable_mpris2=auto)
-
-if test $enable_mpris2 = no ; then
-    have_mpris2=no
-else
-    AC_CHECK_PROG(have_mpris2, gdbus-codegen, yes, no)
-    if test $have_mpris2 = yes ; then
-        GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
-    elif test $enable_mpris2 = yes ; then
-        AC_MSG_ERROR([MPRIS 2 plugin could not be enabled; check config.log])
-    fi
-fi
-
-dnl Ogg Vorbis (enabled by default)
-dnl ===============================
-
-dnl This test is reused later to enable/disable Vorbis support in filewriter.
-
-AC_ARG_ENABLE(vorbis,
- [AS_HELP_STRING([--disable-vorbis], [disable Ogg Vorbis support (default=enabled)])],
- [enable_vorbis=$enableval], [enable_vorbis=yes])
-
-if test $enable_vorbis = yes ; then
-    PKG_CHECK_MODULES(VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0])
-    INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
-fi
-
-dnl FLAC (enabled by default)
-dnl =========================
-
-AC_ARG_ENABLE(flacng,
- [AS_HELP_STRING([--disable-flacng], [disable FLAC support (default=enabled)])],
- [enable_flacng=$enableval], [enable_flacng=yes])
-
-if test $enable_flacng = yes ; then
-    PKG_CHECK_MODULES(LIBFLAC, [flac >= 1.2.1])
-    INPUT_PLUGINS="$INPUT_PLUGINS flacng"
-fi
-
-dnl *** WavPack 4.31 support
-
-AC_ARG_ENABLE(wavpack,
-    [AS_HELP_STRING([--disable-wavpack], [disable WavPack input plugin (default=enabled)])],
-    [enable_wavpack=$enableval],
-    [enable_wavpack=auto]
-)
-
-have_wavpack=no
-if test "x$enable_wavpack" != "xno"; then
-    PKG_CHECK_MODULES(WAVPACK, [wavpack >= 4.31],
-        [have_wavpack=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS wavpack"],
-        [if test "x$enable_wavpack" = "xyes"; then
-            AC_MSG_ERROR([Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** WavPack plugin disabled per user request ***])
-fi
-
-dnl AAC (enabled by default)
-dnl ========================
-
-AC_ARG_ENABLE(aac,
- [AS_HELP_STRING([--disable-aac], [disable AAC support (default=enabled)])],
- [enable_aac=$enableval], [enable_aac=yes])
-
-if test $enable_aac = yes ; then
-    AC_CHECK_HEADER([neaacdec.h], [have_aac=yes], [have_aac=no])
-    AC_CHECK_LIB([faad], [NeAACDecInit2], [have_aac=$have_aac], [have_aac=no])
-
-    if test $have_aac != yes ; then
-        AC_MSG_ERROR([Please install libfaad, or use --disable-aac to disable AAC support.])
-    fi
-
-    FAAD_CFLAGS=
-    FAAD_LIBS="-lfaad"
-    AC_SUBST(FAAD_CFLAGS)
-    AC_SUBST(FAAD_LIBS)
-
-    INPUT_PLUGINS="$INPUT_PLUGINS aac-raw"
-fi
-
-dnl *** sndfile
-
-AC_ARG_ENABLE(sndfile,
-    [AS_HELP_STRING([--disable-sndfile], [disable sndfile extensions. [default=enabled]])],
-    [enable_sndfile=$enableval],
-    [enable_sndfile=auto]
-)
-
-have_sndfile=no
-if test "x$enable_sndfile" != "xno"; then
-    PKG_CHECK_MODULES(SNDFILE, [sndfile >= 0.19],
-        [have_sndfile=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS sndfile"],
-        [if test "x$enable_sndfile" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** libsndfile extensions disabled per user request ***])
-fi
-
-dnl *** modplug
-
-AC_ARG_ENABLE(modplug,
-    [AS_HELP_STRING([--disable-modplug], [disable ModPlug plugin (default=enabled)])],
-    [enable_modplug=$enableval],
-    [enable_modplug=auto]
-)
-
-have_modplug=no
-if test "x$enable_modplug" != "xno"; then
-    PKG_CHECK_MODULES(MODPLUG, [libmodplug],
-     [INPUT_PLUGINS="$INPUT_PLUGINS modplug"
-      have_modplug=yes],
-     [if test "x$enable_modplug" = "xyes"; then
-         AC_MSG_ERROR([Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again])
-      fi]
-    )
-fi
-
 dnl *** FFaudio
 
 AC_ARG_WITH([ffmpeg],
  AS_HELP_STRING([--with-ffmpeg=ffmpeg,libav,none], [choose between FFmpeg, libav, or neither (default=ffmpeg)]),
- [ffmpeg_variant=$withval],
- [ffmpeg_variant=ffmpeg])
+ [ffmpeg_variant=$withval], [ffmpeg_variant=ffmpeg])
 
 if test $ffmpeg_variant = ffmpeg ; then
-    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0],
+    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.40.0 libavformat >= 53.25.0 libavutil >= 51.27.0],
      [INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
       AC_DEFINE([HAVE_FFMPEG], [1], [Define if using FFmpeg])],
-     [AC_MSG_ERROR([FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead.])])
+     [AC_MSG_ERROR([FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.25.0, libavutil 51.27.0).  Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead.])])
 elif test $ffmpeg_variant = libav ; then
-    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0],
+    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.25.0 libavformat >= 53.17.0 libavutil >= 51.18.0],
      [INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
       AC_DEFINE([HAVE_LIBAV], [1], [Define if using libav])],
-     [AC_MSG_ERROR([libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0).])])
-fi
-
-dnl *** jack output plugin
-
-AC_ARG_ENABLE(jack,
- [AS_HELP_STRING([--disable-jack], [disable JACK output plugin (default=enabled)])],
- [enable_jack=$enableval], [enable_jack=auto])
-
-have_jack=no
-if test "x$enable_jack" != "xno"; then
-    PKG_CHECK_MODULES(JACK, [jack >= 1.9.7],
-        [have_jack=yes],
-        [PKG_CHECK_MODULES(JACK, [jack >= 0.120.1 jack < 1.0],
-            [have_jack=yes],
-            [have_jack=no])]
-    )
-
-    if test "x$have_jack" = "xyes"; then
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack-ng"
-    elif test "x$enable_jack" = "xyes"; then
-        AC_MSG_ERROR([Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) development files, but compilation of JACK output plugin has been explicitly requested; please install JACK dev files and run configure again])
-    fi
-fi
-
-dnl *** sid
-AC_ARG_ENABLE(sid,
-[AS_HELP_STRING([--disable-sid], [disable SID input plugin (default=enabled)])],
-                [enable_sid=$enableval], [enable_sid=auto])
-
-have_sidplay=no
-if test "x$enable_sid" != "xno"; then
-    PKG_CHECK_MODULES([SIDPLAYFP], [libsidplayfp >= 1.0],
-        [have_sidplay=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS sid"],
-        [if test "x$enable_sid" = "xyes"; then
-            AC_MSG_ERROR([Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** SID plugin disabled per user request ***])
-fi
-
-dnl OSS output
-dnl ==========
-
-AC_ARG_ENABLE(oss4,
- [AS_HELP_STRING([--disable-oss4], [disable OSS4 output plugin])],
- [enable_oss4=$enableval], [enable_oss4=auto])
-
-OSS_CFLAGS=
-have_oss4=no
-if test "x$enable_oss4" != "xno" ; then
-    if test -f "/etc/oss.conf"; then
-        . "/etc/oss.conf"
-        OSS_CFLAGS="-I$OSSLIBDIR/include"
-    fi
-
-    OLD_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
-    AC_CHECK_HEADERS([sys/soundcard.h soundcard.h], [have_oss4=yes])
-    CPPFLAGS="$OLD_CPPFLAGS"
-
-    if test "x$have_oss4" = "xyes" ; then
-        OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-        AC_SUBST(OSS_CFLAGS)
-    elif test "x$enable_oss4" = "xyes" ; then
-        AC_MSG_ERROR([OSS4 output was enabled but soundcard.h was not found])
-    fi
-fi
-
-dnl *** ALSA output plugin
-
-AC_ARG_ENABLE(alsa,
-    [AS_HELP_STRING([--disable-alsa], [disable ALSA output plugin])],
-    [enable_alsa=$enableval],
-    [enable_alsa=auto]
-)
-
-have_alsa=no
-if test "x$enable_alsa" != "xno"; then
-    PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16],
-        [have_alsa=yes
-         OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"],
-        [if test "x$enable_alsa" = "xyes"; then
-            AC_MSG_ERROR([Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again])
-         fi])
-else
-    AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***])
+     [AC_MSG_ERROR([libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.17.0, libavutil 51.18.0).])])
 fi
 
 dnl SDL Output
 dnl ==========
 
-AC_ARG_ENABLE(sdlout,
- [AS_HELP_STRING([--disable-sdlout], [disable SDL output plugin])],
- [enable_sdlout=$enableval], [enable_sdlout=auto])
-
-if test "x$enable_sdlout" != "xno"; then
-    AC_ARG_WITH(libsdl,
-                [AS_HELP_STRING([--with-libsdl=VER], [select which SDL version to use. Set VER to 1 for libsdl1, to 2 for libsdl2. @<:@default=check@:>@])],
-                [case "x$withval" in
-                     x1) ;;
-                     x2) ;;
-                     x*) withval=check;;
-                 esac
-                 with_libsdl=$withval], [with_libsdl=check])
-fi
+AC_ARG_WITH(libsdl,
+ AS_HELP_STRING([--with-libsdl=1,2], [select which SDL version to use (default=auto)]),
+ [with_libsdl=$withval], [with_libsdl=auto])
 
-libsdl1_min="1.2.11";
-libsdl2_min="2.0";
-
-have_sdlout=no
-if test "x$enable_sdlout" != "xno"; then
-    if test "x$with_libsdl" = "xcheck"; then
-        PKG_CHECK_MODULES([SDL], [sdl2 >= $libsdl2_min],
-           [have_sdlout=yes
-            OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
-           [PKG_CHECK_MODULES([SDL], [sdl >= $libsdl1_min],
-               [have_sdlout=yes
-                OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
-               [if test "x$enable_sdlout" = "xyes"; then
-                   AC_MSG_ERROR([Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again])
-                fi])])
-    elif test "x$with_libsdl" = "x1"; then
-        PKG_CHECK_MODULES([SDL], [sdl >= $libsdl1_min],
-            [have_sdlout=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
-            [if test "x$enable_sdlout" = "xyes"; then
-                 AC_MSG_ERROR([Cannot find SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 dev files and run configure again])
-             fi])
+test_sdlout () {
+    if test "x$with_libsdl" = "x1"; then
+        PKG_CHECK_MODULES(SDL, sdl >= 1.2.11, have_sdlout=yes, have_sdlout=no)
     elif test "x$with_libsdl" = "x2"; then
-        PKG_CHECK_MODULES([SDL], [sdl2 >= $libsdl2_min],
-            [have_sdlout=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
-            [if test "x$enable_sdlout" = "xyes"; then
-                 AC_MSG_ERROR([Cannot find SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 dev files and run configure again])
-             fi])
+        PKG_CHECK_MODULES(SDL, sdl2 >= 2.0, have_sdlout=yes, have_sdlout=no)
+    else
+        PKG_CHECK_MODULES(SDL, sdl2 >= 2.0, have_sdlout=yes, [
+            PKG_CHECK_MODULES(SDL, sdl >= 1.2.11, have_sdlout=yes, have_sdlout=no)
+        ])
     fi
-fi
-
-dnl *** sndio output
+}
 
-AC_ARG_ENABLE(sndio,
-    [AS_HELP_STRING([--disable-sndio], [disable sndio output plugin (default=enabled)])],
-    [enable_sndio=$enableval],
-    [enable_sndio=auto]
-)
-
-have_sndio=no
-if test "x$enable_sndio" != "xno"; then
-    AC_CHECK_HEADER([sndio.h],
-        [AC_CHECK_LIB([sndio], [sio_open],
-            [have_sndio=yes
-             OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio-ng"
-             SNDIO_LIBS="-lsndio"
-             AC_SUBST(SNDIO_LIBS)]
-         )]
-    )
-
-    if test "x$enable_sndio" = "xyes" -a "x$have_sndio" != "xyes"; then
-        AC_MSG_ERROR([Cannot find sndio development files, but compilation of sndio output plugin has been explicitly requested; please install sndio dev files and run configure again])
-    fi
-fi
+ENABLE_PLUGIN_WITH_TEST(sdlout,
+    SDL Output,
+    auto,
+    OUTPUT)
 
 dnl Check for at least one output plugin (not including filewriter)
 dnl ===============================================================
@@ -648,157 +565,26 @@ if test "x$OUTPUT_PLUGINS" = "x" ; then
     AC_MSG_ERROR([No output plugin was enabled.  Please install the necessary packages for your system and run configure again.])
 fi
 
-dnl amidi-plug
-dnl ==========
-
-AC_ARG_ENABLE(amidiplug,
- [AS_HELP_STRING([--disable-amidiplug], [disable amidi-plug input plugin])],
- [enable_amidiplug=$enableval], [enable_amidiplug=auto])
-
-have_amidiplug=no
-if test "x$enable_amidiplug" != "xno"; then
-    PKG_CHECK_MODULES(FLUIDSYNTH, [fluidsynth >= 1.0.6],
-        [have_amidiplug=yes
-         INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"],
-        [if test "x$enable_amidiplug" = "xyes"; then
-            AC_MSG_ERROR([Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth dev files and run configure again])
-         fi])
-fi
-
-dnl Audio CD
-dnl ========
-
-AC_ARG_ENABLE(cdaudio,
-    [AS_HELP_STRING([--disable-cdaudio], [disable cdaudio-ng input plugin (default=enabled)])],
-    [enable_cdaudio_ng=$enableval],
-    [enable_cdaudio_ng=auto]
-)
-
-have_cdaudio_ng=no
-if test "x$enable_cdaudio_ng" != "xno"; then
-    PKG_CHECK_MODULES(CDIO, [libcdio >= 0.70 libcdio_cdda >= 0.70],
-        [PKG_CHECK_MODULES(CDDB, [libcddb >= 1.2.1],
-            [have_cdaudio_ng=yes
-             INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
-             GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
-             AC_SUBST(CDIO_LIBS)
-             AC_SUBST(CDIO_CFLAGS)
-             AC_SUBST(CDDB_LIBS)
-             AC_SUBST(CDDB_CFLAGS)],
-            [AC_MSG_WARN([*** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***])]
-         )],
-        [AC_MSG_WARN([*** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***])]
-    )
-
-    if test "x$enable_cdaudio_ng" = "xyes" -a "x$have_cdaudio_ng" != "xyes"; then
-        AC_MSG_ERROR([Compilation of cdaudio-ng input plugin has been explicitly requested; please install required dev files and run configure again])
-    fi
-fi
-
-dnl *** scrobbler2 ***
-
-AC_ARG_ENABLE(scrobbler2,
- [AS_HELP_STRING([--disable-scrobbler2], [disable Scrobbler 2 plugin (default=enabled)])],
- [enable_scrobbler2=$enableval], [enable_scrobbler2=auto])
-
-have_scrobbler2=no
-
-if test $enable_scrobbler2 = yes -a $USE_GTK != yes ; then
-    AC_MSG_ERROR([--enable-scrobbler2 cannot be used without --enable-gtk])
-fi
-
-if test $enable_scrobbler2 != no -a $USE_GTK = yes ; then
-    PKG_CHECK_MODULES(CURL, [libcurl >= 7.9.7],
-        [have_scrobbler2=yes
-         AC_SUBST(CURL_CFLAGS)
-         AC_SUBST(CURL_LIBS)]
-         GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2",
-        [if test "x$enable_scrobbler2" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl neon HTTP support (enabled by default)
-dnl ======================================
-
-AC_ARG_ENABLE(neon,
- [AS_HELP_STRING([--disable-neon], [disable neon HTTP support (default=enabled)])],
- [enable_neon=$enableval], [enable_neon=yes])
-
-if test $enable_neon = yes ; then
-    PKG_CHECK_MODULES(NEON, [neon >= 0.27])
-    TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
-fi
-
-dnl MMS
-dnl ===
-
-AC_ARG_ENABLE(mms,
-[AS_HELP_STRING([--disable-mms], [disable mms support. (default=enabled)])],
-[enable_mms=$enableval],
-[enable_mms=auto])
-
-have_mms=no
-if test "x$enable_mms" != "xno"; then
-    PKG_CHECK_MODULES(MMS, [libmms >= 0.3],
-        [have_mms=yes
-         TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"],
-        [if test "x$enable_mms" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** mms plugin disabled by request ***])
-fi
-
-dnl CUE
-dnl ---
-
-AC_ARG_ENABLE(cue,
-[AS_HELP_STRING([--disable-cue], [disable cue support. (default=enabled)])],
-[enable_cue=$enableval],
-[enable_cue=auto])
-
-have_cue=no
-if test "x$enable_cue" != "xno"; then
-    PKG_CHECK_MODULES(CUE, [libcue],
-        [have_cue=yes
-         CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"],
-        [if test "x$enable_cue" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** cue plugin disabled by request ***])
-fi
-
 dnl FileWriter
 dnl ==========
 
 AC_ARG_ENABLE(filewriter,
     [AS_HELP_STRING([--disable-filewriter], [disable FileWriter output plugin (default=enabled)])],
     [enable_filewriter=$enableval],
-    [enable_filewriter=$USE_GTK]
+    [enable_filewriter=yes]
 )
 
-have_filewriter=no
 if test "x$enable_filewriter" != "xno"; then
-    if test "x$USE_GTK" != "xyes"; then
-        AC_MSG_ERROR([--enable-filewriter cannot be used without --enable-gtk])
-    fi
-    have_filewriter=yes
     OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
 fi
 
-
 AC_ARG_ENABLE(filewriter_mp3,
     [AS_HELP_STRING([--disable-filewriter_mp3], [disable FileWriter MP3 output part (default=enabled)])],
     [enable_filewriter_mp3=$enableval], [enable_filewriter_mp3=auto]
 )
 
 have_lame=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
     AC_CHECK_LIB([mp3lame], [lame_get_id3v2_tag],
         [have_lame=yes
          AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
@@ -810,186 +596,23 @@ if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
     )
 fi
 
-dnl Vorbis support reuses test done for Vorbis input plugin.
+dnl Vorbis and FLAC support support reuse input plugin checks.
 
-have_vorbisenc=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_vorbis" = "xyes"; then
-    have_vorbisenc=yes
+if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
     AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
     FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
     FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
 
-AC_ARG_ENABLE(filewriter_flac,
-    [AS_HELP_STRING([--disable-filewriter_flac], [disable FileWriter FLAC output part (default=enabled)])],
-    [enable_filewriter_flac=$enableval], [enable_filewriter_flac=auto]
-)
-
-have_writer_flac=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_flac" != "xno"; then
-    PKG_CHECK_MODULES(FLAC, [flac >= 1.1.3],
-        [have_writer_flac=yes
-         AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
-         FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $FLAC_CFLAGS"
-         FILEWRITER_LIBS="$FILEWRITER_LIBS $FLAC_LIBS"],
-        [if test "x$enable_filewriter_flac" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again])
-         fi]
-   )
+if test "x$enable_filewriter" = "xyes" -a "x$have_flac" != "xyes"; then
+    AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
+    FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $LIBFLAC_CFLAGS"
+    FILEWRITER_LIBS="$FILEWRITER_LIBS $LIBFLAC_LIBS"
 fi
 
 AC_SUBST(FILEWRITER_CFLAGS)
 AC_SUBST(FILEWRITER_LIBS)
 
-dnl *** BS2B effect plugin
-
-AC_ARG_ENABLE(bs2b,
-    [AS_HELP_STRING([--disable-bs2b], [disable BS2B effect plugin (default=enabled)])],
-    [enable_bs2b=$enableval],
-    [enable_bs2b=auto]
-)
-
-have_bs2b=no
-if test "x$enable_bs2b" != "xno"; then
-    PKG_CHECK_MODULES([BS2B], [libbs2b >= 3.0.0],
-        [have_bs2b=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"],
-        [if test "x$enable_bs2b" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again])
-         fi]
-    )
-else
-    AC_MSG_RESULT([*** BS2B effect plugin disabled per user request ***])
-fi
-
-dnl *** Resample effect plugin
-
-AC_ARG_ENABLE(resample,
- [AS_HELP_STRING([--disable-resample], [disable resample effect plugin (default=enabled)])],
- [enable_resample=$enableval], [enable_resample=auto]
-)
-
-have_resample=no
-if test "x$enable_resample" != "xno"; then
-    PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
-        [have_resample=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS resample"],
-        [if test "x$enable_resample" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl Speed and Pitch effect plugin
-dnl =============================
-
-AC_ARG_ENABLE(speedpitch,
- [AS_HELP_STRING([--disable-speedpitch],[disable Speed and Pitch effect plugin])],
- [enable_speedpitch="$enableval"], [enable_speedpitch=auto])
-
-have_speedpitch=no
-if test "x$enable_speedpitch" != "xno"; then
-    PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
-        [have_speedpitch=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"],
-        [if test "x$enable_speedpitch" = "xyes"; then
-            AC_MSG_ERROR([Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl *** SoX Resampler effect plugin
-
-AC_ARG_ENABLE(soxr,
- [AS_HELP_STRING([--disable-soxr], [disable SoX Resampler effect plugin (default=enabled)])],
- [enable_soxr=$enableval], [enable_soxr=auto]
-)
-
-have_soxr=no
-if test "x$enable_soxr" != "xno"; then
-    PKG_CHECK_MODULES([SOXR], [soxr],
-        [have_soxr=yes
-         EFFECT_PLUGINS="$EFFECT_PLUGINS sox-resampler"],
-        [if test "x$enable_soxr" = "xyes"; then
-            AC_MSG_ERROR([Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again])
-         fi]
-    )
-fi
-
-dnl OpenGL Spectrum Analyzer
-dnl ========================
-
-AC_ARG_ENABLE(glspectrum,
- [AS_HELP_STRING([--enable-glspectrum], [enable OpenGL Spectrum Analyzer (default=auto)])],
- [enable_glspectrum=$enableval], [enable_glspectrum=auto])
-
-have_glspectrum=no
-
-if test $enable_glspectrum = yes -a $USE_GTK != yes ; then
-    AC_MSG_ERROR([--enable-glspectrum cannot be used without --enable-gtk])
-fi
-
-if test $enable_glspectrum != no -a $USE_GTK = yes ; then
-    if test $HAVE_MSWINDOWS = yes ; then
-        have_glspectrum=yes
-        GL_LIBS="-lopengl32"
-    else
-        AC_CHECK_LIB(GL, glXCreateContext, [have_glspectrum=yes], [have_glspectrum=no])
-        if test $have_glspectrum = yes ; then
-            GL_LIBS="-lGL -lX11"
-        fi
-    fi
-
-    if test $enable_glspectrum = yes && test $have_glspectrum = no ; then
-        AC_MSG_ERROR([Unable to enable OpenGL Spectrum Analyzer; check config.log])
-    fi
-
-    if test $have_glspectrum = yes ; then
-        VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"
-    fi
-fi
-
-AC_SUBST(GL_LIBS)
-
-dnl Qt OpenGL Spectrum Analyzer
-dnl ===========================
-
-AC_ARG_ENABLE(qtglspectrum,
-    [AS_HELP_STRING([--disable-qtglspectrum], [disable Qt OpenGL Spectrum Analyzer (default=enabled)])],
-    [enable_qtglspectrum=$enableval],
-    [enable_qtglspectrum=auto])
-
-have_qtglspectrum=no
-
-if test "x$USE_QT" = "xno" -a "x$enable_qtglspectrum" = "xyes"; then
-    AC_MSG_ERROR([--enable-qtglspectrum cannot be used without --enable-qt])
-fi
-
-if test "x$USE_QT" = "xyes" -a "x$enable_qtglspectrum" != "xno"; then
-    if test $have_glspectrum = yes ; then
-        have_qtglspectrum=yes
-    elif test $HAVE_MSWINDOWS = yes ; then
-        have_qtglspectrum=yes
-        GL_LIBS="-lopengl32"
-    else
-        AC_CHECK_LIB(GL, glBegin, [have_qtglspectrum=yes], [have_qtglspectrum=no])
-        if test $have_qtglspectrum = yes ; then
-            GL_LIBS="-lGL"
-        fi
-    fi
-
-    if test "x$have_qtglspectrum" = "xyes"; then
-        PKG_CHECK_MODULES(QTOPENGL, [Qt5OpenGL], [have_qtglspectrum=yes], [have_qtglspectrum=no])
-    fi
-
-    if test "x$have_qtglspectrum" = "xyes"; then
-        QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
-        VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum-qt"
-    elif test "x$enable_qtglspectrum" = "xyes"; then
-        AC_MSG_ERROR([Qt OpenGL Spectrum Analyzer could not be enabled; check config.log])
-    fi
-fi
-
 dnl Mac Media Keys
 dnl ============
 
@@ -1060,110 +683,134 @@ echo "Configuration:"
 echo
 echo "  Install path:                           $plugindir"
 echo
-echo "  Output Plugins"
-echo "  --------------"
-echo "  Open Sound System (oss4):               $have_oss4"
-echo "  Advanced Linux Sound Arch. (alsa):      $have_alsa"
-echo "  Sndio (sndio):                          $have_sndio"
-echo "  CoreAudio (coreaudio):                  $have_coreaudio"
-echo "  PulseAudio (pulse):                     $have_pulse"
-echo "  Jack Audio Connection Kit (jack):       $have_jack"
-echo "  Simple DirectMedia Layer (sdlout):      $have_sdlout"
-echo "  Qt Multimedia (qtaudio):                $have_qtaudio"
-echo "  FileWriter:                             $have_filewriter"
-echo "    -> FileWriter MP3 output part:        $have_lame"
-echo "    -> FileWriter Vorbis output part:     $have_vorbisenc"
-echo "    -> FileWriter FLAC output part:       $have_writer_flac"
+echo "  GTK+ support:                           $USE_GTK"
+echo "  Qt support:                             $USE_QT"
 echo
-echo "  Input Plugins"
+echo "  Audio Formats"
 echo "  -------------"
-echo "  MPEG-1 Layer I/II/III (mpg123):         $enable_mp3"
-echo "  MPEG-2/4 AAC (aac):                     $enable_aac"
-echo "  FFaudio (ffaudio):                      $ffmpeg_variant"
-echo "  Module decoder (modplug):               $have_modplug"
-echo "  MIDI synthesizer (amidi-plug):          $have_amidiplug"
-echo "  CD Digital Audio (cdaudio_ng):          $have_cdaudio_ng"
-echo "  sndfile extensions:                     $have_sndfile"
-echo "  Tone Generator:                         yes"
-echo "  Ogg Vorbis (vorbis):                    $enable_vorbis"
-echo "  Free Lossless Audio Codec (flacng):     $enable_flacng"
-echo "  Commodore 64 audio (SID):               $have_sidplay"
-echo "  Game music (spc, nsf & gbs):            $have_console"
-echo "  PlayStation (psf/psf2) audio:           yes"
-echo "  Nintendo DS audio (xsf):                yes"
+echo "  Audio CD:                               $have_cdaudio"
+echo "  Free Lossless Audio Codec:              $have_flac"
+echo "  Ogg Vorbis:                             $have_vorbis"
+echo "  MIDI (via FluidSynth):                  $have_amidiplug"
+echo "  MPEG-1 Layer I/II/III (via mpg123):     $have_mpg123"
+echo "  MPEG-2/4 AAC:                           $have_aac"
+echo "  WavPack:                                $have_wavpack"
+echo
+echo "  External Decoders"
+echo "  -----------------"
+echo "  FFmpeg/Libav:                           $ffmpeg_variant"
+echo "  libsndfile:                             $have_sndfile"
+echo
+echo "  Chiptunes"
+echo "  ---------"
 echo "  AdLib synthesizer (adplug):             yes"
-echo "  WavPack 4.31+ (wavpack):                $have_wavpack"
-echo "  Metronom:                               yes"
-echo "  VTX Decoder:                            yes"
+echo "  Commodore 64 audio (sid):               $have_sid"
+echo "  Game Music Emu (spc, nsf, gbs, etc.):   $have_console"
+echo "  ModPlug:                                $have_modplug"
+echo "  Nintendo DS audio (xsf):                yes"
+echo "  PlayStation audio (psf/psf2):           yes"
+echo "  Vortex Tracker (vtx):                   yes"
 echo
-echo "  General"
-echo "  -------"
-echo "  Alarm:                                  $USE_GTK"
-echo "  Album Art:                              $USE_GTK"
-echo "  Album Art (Qt):                         $USE_QT"
-echo "  Delete from Filesystem:                 $USE_GTK"
-echo "  Linux Infrared Remote Control (LIRC)    $have_lirc"
-echo "  MPRIS 2 Server:                         $have_mpris2"
-echo "  Playlist Manager:                       $USE_GTK"
-echo "  Playlist Manager (Qt):                  $USE_QT"
-echo "  Search Tool:                            $USE_GTK"
-echo "  Search Tool (Qt):                       $USE_QT"
-echo "  Song Change:                            $have_songchange"
-echo "  Song Info (Qt):                         $USE_QT"
-echo "  Status Icon:                            $USE_GTK"
-echo "  Status Icon (Qt):                       $USE_QT"
-echo "  Audacious OSD:                          $have_aosd"
-echo "    -> X Composite support:               $have_aosd_xcomp"
-echo "  libnotify OSD:                          $have_notify"
-echo "  Global Hotkey Plugin:                   $have_hotkey"
-echo "  Gnome Shortcuts Plugin:                 $have_gnomeshortcuts"
-echo "  Scrobbler 2.0:                          $have_scrobbler2"
-echo "  LyricWiki viewer:                       $USE_GTK"
-echo "  LyricWiki viewer (Qt):                  $USE_QT"
-echo "  Mac Media Keys:                         $enable_mac_media_keys"
+echo "  Other Inputs"
+echo "  ------------"
+echo "  Metronome:                              yes"
+echo "  Tone Generator:                         yes"
 echo
-echo "  Effect"
-echo "  ------"
+echo "  Effects"
+echo "  -------"
+echo "  Bauer stereophonic-to-binaural (bs2b):  $have_bs2b"
 echo "  Channel Mixer:                          yes"
 echo "  Crystalizer:                            yes"
 echo "  Dynamic Range Compressor:               yes"
 echo "  Echo/Surround:                          yes"
 echo "  Extra Stereo:                           yes"
-echo "  LADSPA Host:                            $USE_GTK"
-echo "  Voice Removal:                          yes"
-echo "  Bauer stereophonic-to-binaural (bs2b):  $have_bs2b"
-echo "  Sample Rate Converter (resample):       $have_resample"
+echo "  LADSPA Host (requires GTK+):            $USE_GTK"
+echo "  Sample Rate Converter:                  $have_resample"
 echo "  Silence Removal:                        yes"
-echo "  Speed and Pitch:                        $have_speedpitch"
 echo "  SoX Resampler:                          $have_soxr"
+echo "  Speed and Pitch:                        $have_speedpitch"
+echo "  Voice Removal:                          yes"
 echo
-echo "  Visualization"
-echo "  -------------"
-echo "  Blur Scope:                             $USE_GTK"
-echo "  Cairo Spectrum Analyzer:                $USE_GTK"
-echo "  GTK+ OpenGL Spectrum Analyzer:          $have_glspectrum"
-echo "  Qt OpenGL Spectrum Analyzer:            $have_qtglspectrum"
-echo
-echo "  Transport"
-echo "  ---------"
-echo "  neon-based http/https:                  $enable_neon"
-echo "  libmms-based mms:                       $have_mms"
-echo "  GIO:                                    yes"
+echo "  Outputs"
+echo "  -------"
+echo "  Advanced Linux Sound Architecture:      $have_alsa"
+echo "  Jack Audio Connection Kit:              $have_jack"
+echo "  Open Sound System:                      $have_oss4"
+echo "  PulseAudio:                             $have_pulse"
+echo "  Simple DirectMedia Layer:               $have_sdlout"
+echo "  Sndio:                                  $have_sndio"
+echo "  Win32 waveOut:                          $HAVE_MSWINDOWS"
+echo "  FileWriter:                             $enable_filewriter"
+echo "    -> MP3 encoding:                      $have_lame"
+echo "    -> Vorbis encoding:                   $have_vorbis"
+echo "    -> FLAC encoding:                     $have_flac"
 echo
-echo "  Container"
+echo "  Playlists"
 echo "  ---------"
-echo "  Audacious playlist format (audpl):      yes"
-echo "  Winamp PLS playlist format (pls):       yes"
-echo "  M3U playlist format (m3u):              yes"
+echo "  Cue sheets:                             $have_cue"
+echo "  M3U playlists:                          yes"
 echo "  Microsoft ASX (legacy):                 yes"
 echo "  Microsoft ASX 3.0:                      yes"
-echo "  XML Sharable Playlist Format (xspf):    yes"
-echo "  CUE playlist format (cue):              $have_cue"
+echo "  PLS playlists:                          yes"
+echo "  XML Sharable Playlist Format (XSPF):    yes"
 echo
-echo "  Interfaces"
+echo "  Transports"
 echo "  ----------"
-echo "  GTK (gtkui):                            $USE_GTK"
-echo "  Qt (qtui):                              $USE_QT"
-echo "  Winamp Classic (skins):                 $USE_GTK"
-echo "  Winamp Classic (skins, Qt):             $USE_QT"
+echo "  FTP, SFTP, SMB (via GIO):               yes"
+echo "  HTTP/HTTPS (via neon):                  $have_neon"
+echo "  MMS (via libmms):                       $have_mms"
 echo
+echo "  General"
+echo "  -------"
+echo "  Alarm (requires GTK+):                  $USE_GTK"
+echo "  Ampache browser (requires Qt):          $have_ampache"
+echo "  Delete Files:                           $USE_GTK_OR_QT"
+echo "  GNOME Shortcuts:                        $have_gnomeshortcuts"
+echo "  libnotify OSD:                          $have_notify"
+echo "  Linux Infrared Remote Control (LIRC):   $have_lirc"
+echo "  MPRIS 2 Server:                         $have_mpris2"
+echo "  Scrobbler 2.0:                          $have_scrobbler2"
+echo "  Song Change:                            $have_songchange"
+echo
+
+if test "x$USE_GTK" = "xyes" ; then
+    echo "  GTK+ Support"
+    echo "  ------------"
+    echo "  GTK Interface:                          yes"
+    echo "  Winamp Classic Interface:               yes"
+    echo "  Album Art:                              yes"
+    echo "  Blur Scope:                             yes"
+    echo "  OpenGL Spectrum Analyzer:               $have_glspectrum"
+    echo "  LyricWiki viewer:                       yes"
+    echo "  Playlist Manager:                       yes"
+    echo "  Search Tool:                            yes"
+    echo "  Spectrum Analyzer (2D):                 yes"
+    echo "  Status Icon:                            yes"
+    echo "  X11 Global Hotkeys:                     $have_hotkey"
+    echo "  X11 On-Screen Display (aosd):           $have_aosd"
+    echo
+fi
+
+if test "x$USE_QT" = "xyes" ; then
+    echo "  Qt Support"
+    echo "  ----------"
+    echo "  Qt Multimedia output:                   $have_qtaudio"
+    echo "  Qt Interface:                           yes"
+    echo "  Winamp Classic Interface:               yes"
+    echo "  Album Art:                              yes"
+    echo "  LyricWiki viewer:                       yes"
+    echo "  OpenGL Spectrum Analyzer:               $have_qtglspectrum"
+    echo "  Playlist Manager:                       yes"
+    echo "  Search Tool:                            yes"
+    echo "  Song Info:                              yes"
+    echo "  Status Icon:                            yes"
+    echo
+fi
+
+if test "x$HAVE_DARWIN" = "xyes" ; then
+    echo "  Mac OS X Support"
+    echo "  ----------------"
+    echo "  CoreAudio output:                       $have_coreaudio"
+    echo "  Media Keys:                             $enable_mac_media_keys"
+    echo
+fi
diff --git a/extra.mk.in b/extra.mk.in
index 0c91b42..3bf296f 100644
--- a/extra.mk.in
+++ b/extra.mk.in
@@ -21,20 +21,18 @@ USE_QT ?= @USE_QT@
 
 ALSA_CFLAGS ?= @ALSA_CFLAGS@
 ALSA_LIBS ?= @ALSA_LIBS@
+AMPACHE_CFLAGS ?= @AMPACHE_CFLAGS@
+AMPACHE_LIBS ?= @AMPACHE_LIBS@
 BS2B_CFLAGS ?= @BS2B_CFLAGS@
 BS2B_LIBS ?= @BS2B_LIBS@
 CDIO_LIBS ?= @CDIO_LIBS@
 CDIO_CFLAGS ?= @CDIO_CFLAGS@
-CDDB_LIBS ?= @CDDB_LIBS@
-CDDB_CFLAGS ?= @CDDB_CFLAGS@
 CUE_CFLAGS ?= @CUE_CFLAGS@
 CUE_LIBS ?= @CUE_LIBS@
 CURL_CFLAGS ?= @CURL_CFLAGS@
 CURL_LIBS ?= @CURL_LIBS@
 DBUS_CFLAGS ?= @DBUS_CFLAGS@
 DBUS_LIBS ?= @DBUS_LIBS@
-FAAD_CFLAGS ?= @FAAD_CFLAGS@
-FAAD_LIBS ?= @FAAD_LIBS@
 FFMPEG_CFLAGS ?= @FFMPEG_CFLAGS@
 FFMPEG_LIBS ?= @FFMPEG_LIBS@
 FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
@@ -75,7 +73,6 @@ SIDPLAYFP_CFLAGS ?= @SIDPLAYFP_CFLAGS@
 SIDPLAYFP_LIBS ?= @SIDPLAYFP_LIBS@
 SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
 SNDFILE_LIBS ?= @SNDFILE_LIBS@
-SNDIO_LIBS ?= @SNDIO_LIBS@
 QT_CFLAGS ?= @QT_CFLAGS@
 QT_LIBS ?= @QT_LIBS@
 QTMULTIMEDIA_CFLAGS ?= @QTMULTIMEDIA_CFLAGS@
@@ -86,12 +83,10 @@ VORBIS_CFLAGS ?= @VORBIS_CFLAGS@
 VORBIS_LIBS ?= @VORBIS_LIBS@
 WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@
 WAVPACK_LIBS ?= @WAVPACK_LIBS@
-XCOMPOSITE_CFLAGS ?= @XCOMPOSITE_CFLAGS@
-XCOMPOSITE_LIBS ?= @XCOMPOSITE_LIBS@
+X11EXT_CFLAGS ?= @X11EXT_CFLAGS@
+X11EXT_LIBS ?= @X11EXT_LIBS@
 XML_CFLAGS ?= @XML_CFLAGS@
 XML_LIBS ?= @XML_LIBS@
-XRENDER_CFLAGS ?= @XRENDER_CFLAGS@
-XRENDER_LIBS ?= @XRENDER_LIBS@
 
 HAVE_LINUX ?= @HAVE_LINUX@
 HAVE_MSWINDOWS ?= @HAVE_MSWINDOWS@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5729a1..3460b39 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 # Please don't update this file manually - use ./update-potfiles.sh instead!
-src/aac-raw/aac.cc
+src/aac/aac.cc
 src/adplug/adplug-xmms.cc
 src/adplug/core/rix.cc
 src/adplug/core/rix.h
@@ -9,10 +9,11 @@ src/albumart/albumart.cc
 src/albumart-qt/albumart.cc
 src/alsa/alsa.h
 src/alsa/config.cc
-src/amidi-plug/amidi-plug.cc
-src/amidi-plug/i_configure.cc
-src/amidi-plug/i_configure-fluidsynth.cc
-src/amidi-plug/i_fileinfo.cc
+src/amidiplug/amidi-plug.cc
+src/amidiplug/i_configure.cc
+src/amidiplug/i_configure-fluidsynth.cc
+src/amidiplug/i_fileinfo.cc
+src/ampache/ampache.cc
 src/aosd/aosd.cc
 src/aosd/aosd.h
 src/aosd/aosd_style.cc
@@ -24,7 +25,7 @@ src/audpl/audpl.cc
 src/blur_scope/blur_scope.cc
 src/bs2b/plugin.cc
 src/cairo-spectrum/cairo-spectrum.cc
-src/cdaudio-ng/cdaudio-ng.cc
+src/cdaudio/cdaudio-ng.cc
 src/cd-menu-items/cd-menu-items.cc
 src/compressor/compressor.cc
 src/console/Ay_Apu.cc
@@ -89,14 +90,11 @@ src/delete-files/delete-files.cc
 src/echo_plugin/echo.cc
 src/ffaudio/ffaudio-core.cc
 src/filewriter/filewriter.cc
-src/filewriter/mp3.cc
-src/filewriter/vorbis.cc
-src/flacng/flacng.h
-src/flacng/metadata.cc
-src/flacng/plugin.cc
+src/flac/flacng.h
+src/flac/metadata.cc
+src/flac/plugin.cc
 src/gio/gio.cc
-src/gl-spectrum/gl-spectrum.cc
-src/gl-spectrum-qt/gl-spectrum.cc
+src/glspectrum/gl-spectrum.cc
 src/gnomeshortcuts/gnomeshortcuts.cc
 src/gtkui/columns.cc
 src/gtkui/layout.cc
@@ -107,7 +105,7 @@ src/gtkui/ui_playlist_widget.cc
 src/gtkui/ui_statusbar.cc
 src/hotkey/gui.cc
 src/hotkey/plugin.cc
-src/jack-ng/jack-ng.cc
+src/jack/jack-ng.cc
 src/ladspa/plugin.cc
 src/ladspa/plugin.h
 src/lirc/lirc.cc
@@ -133,12 +131,13 @@ src/playlist-manager-qt/playlist-manager-qt.cc
 src/pls/pls.cc
 src/psf/plugin.cc
 src/psf/psx.h
-src/pulse_audio/pulse_audio.cc
+src/pulse/pulse_audio.cc
 src/qtaudio/qtaudio.cc
+src/qtglspectrum/gl-spectrum.cc
 src/qtui/dialog_windows.cc
 src/qtui/filter_input.cc
-src/qtui/main_window_actions.cc
 src/qtui/main_window.cc
+src/qtui/menus.cc
 src/qtui/playlist_model.cc
 src/qtui/qtui.cc
 src/qtui/settings.cc
@@ -173,11 +172,11 @@ src/skins/search-select.cc
 src/skins/skins_cfg.cc
 src/skins/skinselector.cc
 src/sndfile/plugin.cc
-src/sndio-ng/sndio.cc
-src/song_change/song_change.cc
+src/sndio/sndio.cc
+src/songchange/song_change.cc
 src/song-info-qt/song-info.cc
-src/sox-resampler/sox-resampler.cc
-src/speed-pitch/speed-pitch.cc
+src/soxr/sox-resampler.cc
+src/speedpitch/speed-pitch.cc
 src/statusicon-qt/statusicon.cc
 src/statusicon/statusicon.cc
 src/stereo_plugin/stereo.cc
@@ -187,6 +186,7 @@ src/vorbis/vorbis.cc
 src/vorbis/vorbis.h
 src/vtx/info.cc
 src/vtx/vtx.cc
+src/waveout/waveout.cc
 src/wavpack/wavpack.cc
 src/xsf/desmume/types.h
 src/xsf/plugin.cc
diff --git a/po/audacious-plugins.pot b/po/audacious-plugins.pot
index 793d631..4609760 100644
--- a/po/audacious-plugins.pot
+++ b/po/audacious-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -26,27 +26,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -97,147 +97,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr ""
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr ""
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr ""
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr ""
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr ""
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr ""
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr ""
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr ""
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr ""
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr ""
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr ""
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr ""
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr ""
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr ""
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr ""
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr ""
 
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Mixer element:"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -301,68 +301,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -370,86 +370,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr ""
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -461,7 +475,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -513,154 +527,150 @@ msgstr ""
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -676,11 +686,11 @@ msgstr ""
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -704,15 +714,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -724,118 +734,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -988,58 +998,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1077,11 +1089,11 @@ msgstr ""
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1091,15 +1103,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1116,194 +1124,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
+msgid "Auto"
 msgstr ""
 
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
-msgid "Auto"
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:39
-msgid "Joint Stereo"
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
-msgid "Stereo"
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
-msgid "Mono"
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:675
-msgid "Compression ratio:"
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
-msgid "Enforce strict ISO compliance"
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
-msgid "Error protection"
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:766
-msgid "Enable VBR/ABR"
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:776
-msgid "Type:"
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
 msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:443
+msgid "Joint Stereo"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
+msgid "Stereo"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
+msgid "Mono"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:484
+msgid "Compression ratio:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:494
+msgid "Enforce strict ISO compliance"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:496
+msgid "Error protection"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enable VBR/ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:503
+msgid "Type:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:920
-msgid "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
+#: src/filewriter/filewriter.cc:526
+msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr ""
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
 msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr ""
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1311,25 +1403,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1341,23 +1433,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1374,8 +1453,8 @@ msgstr ""
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr ""
@@ -1432,8 +1511,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr ""
 
@@ -1461,335 +1540,338 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr ""
 
@@ -1830,58 +1912,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr ""
 
@@ -1889,9 +1970,9 @@ msgstr ""
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr ""
 
@@ -1899,8 +1980,8 @@ msgstr ""
 msgid "Pause/Resume"
 msgstr ""
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr ""
 
@@ -1994,7 +2075,7 @@ msgstr ""
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2013,35 +2094,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2124,48 +2205,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2177,17 +2258,17 @@ msgstr ""
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2335,15 +2416,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr ""
 
@@ -2355,35 +2436,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2403,15 +2484,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2419,21 +2500,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2470,23 +2551,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2498,35 +2579,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2535,47 +2615,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr ""
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/main_window.cc:95
+msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/main_window.cc:97
+msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
+msgid "Previous"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
-msgid "Open Files"
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
+msgid "Repeat"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
-msgid "Add Files"
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
+msgid "Shuffle"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
-msgid "Previous"
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
-msgid "Repeat"
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
-msgid "Shuffle"
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2617,7 +2714,7 @@ msgstr ""
 msgid "Method:"
 msgstr ""
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2669,52 +2766,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2738,84 +2824,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr ""
 
@@ -2909,15 +2995,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2969,373 +3055,381 @@ msgstr ""
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr ""
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr ""
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr ""
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr ""
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr ""
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr ""
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr ""
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr ""
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr ""
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr ""
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3348,15 +3442,15 @@ msgstr ""
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3444,7 +3538,7 @@ msgid "Slow"
 msgstr ""
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr ""
 
@@ -3576,7 +3670,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3598,66 +3692,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3672,21 +3766,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3695,43 +3789,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr ""
 
@@ -3817,12 +3911,12 @@ msgstr ""
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3839,7 +3933,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3888,26 +3982,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3918,14 +4022,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 6e35eb6..903c6fe 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,10 +7,10 @@
 # debconf <prach.by@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2016-03-15 18:42+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Belarusian (http://www.transifex.com/jlindgren/audacious/"
 "language/be/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -30,27 +30,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Плэер)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Алярм"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -101,147 +101,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Гэта ваш выклік абуджэння."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Напамін"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Панядзелак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Аўторак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Серада"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Чацвер"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Пятніца"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Нядзеля"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Час"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Алярм у час (па-змоўчванню):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "г"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Сцішыць пасля:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "гадзін"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "хвілін"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Абярыце дні для ўжывання алярмаў"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Дзень"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Па-змоўчванню"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дзён"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Згасанне"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунд"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Гучнасць"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Пачаць у"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Фінальны"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Бягучы"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Дадатковы загад"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "уключыць"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Плэйліст (апцыянальны)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Выбраць плэйліст"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опцыі"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Што азначаюць гэтыя опцыі?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Даведка"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Афармленне альбома"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Вывад ALSA"
 
@@ -278,11 +278,11 @@ msgstr "Прылада мікшара:"
 msgid "Mixer element:"
 msgstr "Элемент мікшара:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -305,68 +305,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -374,86 +374,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Памер (байтаў)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Звесткі па MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Фармат:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Даўжыня (мсек):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Нум. трэкаў:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "пераменны"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "УЗХ:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "УЗХ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Каментары і Лірыка </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr " * у гэтым MIDI-файле каментарыі недаступныя *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* у гэтым MIDI-файле лірыка недаступная *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Закры_ць"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(недапушчальны UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -465,7 +479,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -517,94 +531,94 @@ msgstr "Паўза ВЫКЛ."
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Выводзіць OSD калі прайраванне працягваецца з паўзы."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Змяшчэнне"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Зрушэнне адносна X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Зрушэнне адносна Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Максімальная шырыня OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Опцыі для некалькіх манітораў"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Паказваць OSD праз:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "усе маніторы"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "манітор %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Затрымка (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Паказваць:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "З'яўленне:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Знікненне:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Шрыфты"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Шрыфт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Цень"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Стыль Рэндэру"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Колеры"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Колер %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Уключыць трыгер"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Падзея"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Выяўлены кампазітны менэджар"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -614,60 +628,56 @@ msgstr ""
 "калі вы не ведаёце, ці запушчаны ён, актывуйце кампазітны менэджар. Інакш "
 "OSD не будзе працаваць карэктна"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Кампазітны менэджар не патрэбны для імітацыйнай празрыстасці"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Празрыстасць"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Імітацыйная празрыстасць"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Сапраўдная празрыстасць (патрабуе X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Кампазітныя пашырэнні не загружаны"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Кампазітныя пашырэнні недаступныя"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Пазіцыя"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анімацыя"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Тэкст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Абрамленне"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Пераключальнік"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Іншае"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -683,11 +693,11 @@ msgstr "Плэйлісты ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Плэйлісты Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Колер</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Размыты асцылограф"
 
@@ -711,15 +721,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Спектральны аналізатар"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Плагін Аўдыё КД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -731,118 +741,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Прылада</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метазвесткі</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Ужываць CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Ужываць CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Ужываць HTTP замест CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Прывад пусты."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Тып не падтрымліваецца."
 
@@ -995,58 +1005,60 @@ msgstr "Інтэнсіўнасць:"
 msgid "Crystalizer"
 msgstr "Крышталайзер"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Сцерці"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1084,11 +1096,11 @@ msgstr "Гучнасць:"
 msgid "Echo"
 msgstr "Рэха"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Плагін FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1098,15 +1110,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Плагін запісу файлаў"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Абраць каталог"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1123,194 +1131,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Фармат файла вываду:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Запісваць у выточны каталог"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Агульныя"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Аўта"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Аб'яднанае стэрэа"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стэрэа"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Мона"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Алгарытмічная якасць:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Гц)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Бітрэйт (кб/с):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Узровень сціску:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Рэжым аўдыё:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Абарона ад памылак"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Якасць"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Уключыць VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Тып:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Опцыі VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Мінімальны бітрэйт (кб/с):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Максімальны бітрэйт (кб/с):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строгая адпаведнасць мінімальнаму бітрэйту"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Опцыі ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Сярэдні бітрэйт (кб/с):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Узровень якасці VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строгая адпаведнасць мінімальнаму бітрэйту"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Пазначыць copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Пазначыць як арыгінал"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Прымусова дадаваць тэг версіі 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Дадаваць толькі тэг v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Дадаваць толькі тэг v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Якасць"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Тэгі"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Узровень якасці (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Агульныя"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Дэкодар FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1318,25 +1410,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Плагін GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1348,23 +1440,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1381,8 +1460,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Нумар запіса"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Назва"
@@ -1439,8 +1518,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Пошукавая прылада"
 
@@ -1468,335 +1547,338 @@ msgstr ""
 msgid "Disable"
 msgstr "Выключыць"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Адк_рыць файлы ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Адкрыць _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Дадаць _файлы ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Дадаць U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "Аб ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "Вы_йсці"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Прайграць"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Па_уза"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "Сп_ыніць"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Пап_ярэдні"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Нас_тупны"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Па_ўтор"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "У_разнабой"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_Не пераходзіць да наступнай"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Звесткі пра песню ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Перайсці да _часу ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Перайсці да песні ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Па _назве"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Па _нумары трэка"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Па вык_анаўцу"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Па даце _выдання"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Па шляху да файла"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Па адмы_словым загалоўку"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Ад_варотны парадак"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Выпад_ковы парадак"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "А_бнавіць"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Парадкаваць"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Сцерці _недаступныя файлы"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Дадаць"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Перайменаваць ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Імпарт ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "Э_кспарт ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Кіра_ўнік плэйлістоў ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Кіраўнік _чаргі ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Гучней"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Цішэй"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Паказваць стужку _меню"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Паказваць стужку звес_так"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Паказваць ві_зуалізацыю стужкі звестак"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Паказваць стужку _статусу"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "Ф_айл"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Прайграванне"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "П_лэйліст"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "Сервіс_ы"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Выва_д"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "Вы_гляд"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "У чаргу / З чаргі"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Выразаць"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Капіраваць"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Вылучыць усе"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "П_ерайменаваць ..."
 
@@ -1837,33 +1919,32 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Інтэрфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Назапашванне ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "мона"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стэрэа"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1872,25 +1953,25 @@ msgstr[1] "%d каналы"
 msgstr[2] "%d каналаў"
 msgstr[3] "%d каналаў"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d кб/с"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Рэжым плэйліста."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Спыненне пасля песні."
 
@@ -1898,9 +1979,9 @@ msgstr "Спыненне пасля песні."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Граць"
 
@@ -1908,8 +1989,8 @@ msgstr "Граць"
 msgid "Pause/Resume"
 msgstr "Паўза/Працягнуць"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Спыніць"
 
@@ -2003,7 +2084,7 @@ msgstr ""
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2022,35 +2103,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Вывад JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2133,48 +2214,48 @@ msgstr "Перазлучэнне з серверам LIRC"
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Плагін LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Словы недаступныя"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Памылка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Немагчыма атрымаць %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Немагчыма разабраць %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Шукаюцца словы ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Адсутнічаюць метазвесткі ў песні"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Злучэнне з lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2186,17 +2267,17 @@ msgstr "Плэйлісты M3U"
 msgid "Tact Generator"
 msgstr "Тактавы генератар"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактавы генератар: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактавы генератар: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2344,15 +2425,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "Плагін MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr ""
 
@@ -2364,35 +2445,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плагін Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Спынена"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious не іграе."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2412,15 +2493,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2428,21 +2509,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Наступны"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Вывад OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2479,23 +2560,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2507,35 +2588,34 @@ msgstr "Плэйлісты PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Дэкодар OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Вывад PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2544,47 +2624,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Папярэдні"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Паўтор"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Уразнабой"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2626,7 +2723,7 @@ msgstr "<b>Канверсія</b>"
 msgid "Method:"
 msgstr "Метад:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2678,52 +2775,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2747,29 +2833,29 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Бібліятэка"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -2778,7 +2864,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -2787,7 +2873,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2796,41 +2882,41 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Стварыць плэйліст"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Дадаць у плэйліст"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Шукаць у бібліятэцы"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Пачакайце, калі ласка ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Выберыце каталог"
 
@@ -2924,15 +3010,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2984,373 +3070,381 @@ msgstr "16 кГц"
 msgid "Audacious Equalizer"
 msgstr "Эквалайзер Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Гучнасць: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% ўлева"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Баланс: цэнтр"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс:  %d%% ўправа"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Меню опцый"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Адключыць 'Заўсёды зверху'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Уключыць 'Заўсёды зверху'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Плэйліст"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Выгляд"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Не пераходзіць да наступнай"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Новы плэйліст"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Паказваць рэдактар спісаў"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Паказваць эквалайзер"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Заўсёды зверху"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Па загалоўку"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Сцерці усе"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Ачысціць чаргу"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Сцерці недаступныя файлы"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Сцерці дублікаты"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Сцерці невылучаныя"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Сцерці вылучаныя"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Пошук і вылучэнне"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Інвертаваць вылучэнне"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Зняць вылучэнне"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Вылучыць усе"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Па нумары трэка"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Па выканаўцу"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Па альбому"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Раскідаць спіс"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Спіс наадварот"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Сартаваць вылучаныя"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Сартаваць спіс"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Выразаць"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Капіраваць"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Уставіць"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3363,15 +3457,15 @@ msgstr "Рэдактар плэйлістоў Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d з %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Інтэрфейс Winamp-класік"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3459,7 +3553,7 @@ msgid "Slow"
 msgstr "Марудна"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Сярэдне"
 
@@ -3591,7 +3685,7 @@ msgstr "Стварыць новы плэйліст з адпаведнымі з�
 msgid "Sndfile Plugin"
 msgstr "Плагін Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3613,66 +3707,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Пераключэнне песні"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3687,21 +3781,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3710,43 +3804,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Хуткасць"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Значок статусу"
 
@@ -3832,12 +3926,12 @@ msgstr "<b>Дадатковае стэрэа</b>"
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3854,7 +3948,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Выдаленне голасу"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3903,26 +3997,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Дэкодар VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Дэкодар WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3933,14 +4037,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Дэкодар 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 4827aef..b4b52a3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,11 +12,11 @@
 # Радослав Иванов <reckku@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-09-29 08:32+0000\n"
-"Last-Translator: Радослав Иванов <reckku@gmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/jlindgren/audacious/"
 "language/bg/)\n"
 "Language: bg\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Разкодиране на AAC (Raw)"
 
@@ -33,20 +33,20 @@ msgstr "Разкодиране на AAC (Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Плейър)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "подредени"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Аларма"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Задаване на Аларма ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Оригинално написана от Adam Feakin и Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -155,147 +155,147 @@ msgstr ""
 "Въведете напомнянето в полето за въвеждане и\n"
 "отметнете в кутийката, ако искате да бъде показвано."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Това е Вашият сигнал за събуждане."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Вашето напомняне за днес е..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Напомняне"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Понеделник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Петък"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Събота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Неделя"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Час"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Алармиране в (по подразбиране):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "ч"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Затишие след:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "часове"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "минути"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Избор на дни, в които да се активира алармата"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Ден"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дни"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Затихване"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунди"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Сила на звука"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Начало"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Край"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Текущо"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Допълнителна команда"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "активиране"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Списък за изпълнение (по избор)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Избор на списък"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опции"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Какво означават тези опции?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Помощ"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Обложка на албум"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA изход"
 
@@ -338,11 +338,11 @@ msgstr "Миксер:"
 msgid "Mixer element:"
 msgstr "Елемент на миксера:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Плеър)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -384,68 +384,68 @@ msgstr ""
 "Tony Vroon\n"
 "за полезната помощ с алфа тестовете"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Презапис на стандартното усилване:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Презапис на стандартната полифония:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Презапис на стандартното ехо"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Включено"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Презапис на стандартния хор:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Възпроизвеждане</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Транспозиции:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "полутонове"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Промяна на барабана:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "номера на бележките"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Пропусни водещото затишие"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Пропусни последващото затишие"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>Шрифт на звука</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Синтезатор</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Честота на дискретизация"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -453,86 +453,100 @@ msgstr "Честота на дискретизация"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Хц"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Контакт - избор на файл за звуково изравняване"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Отваряне"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Име на файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Размер (байтове)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Име:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI информация </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Продължителност (милисекунди):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "№ на Записи:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "променливост"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "УВМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "УВМ (вълни):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Време Разд.:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Коментари и лирика </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* няма достъпни коментари за този MIDI файл *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* няма достъпна лирика за този MIDI файл *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (невалиден UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -551,7 +565,7 @@ msgstr ""
 "Базиран отчасти на Ghosd библиотеката на Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (прозорец в екрана)"
 
@@ -606,94 +620,94 @@ msgstr "Временното спиране е деактивирано"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Задействане на OSD, когато възпроизвеждането продължи."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Местоположение"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Относителен отстъп за X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Относителен отстъп за Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Максимална ширина на OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Опции за много монитори"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Извеждай OSD, използвайки:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "всички монитори"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "монитор %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Времетраене (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Екран:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Проясняване:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Избледняване:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Сянка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Създай свой стил"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Цвят %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Активиране на активатора"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Събитие"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Засечен е Композитен мениджър"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -703,60 +717,56 @@ msgstr ""
 "моля активирайте мениджъра, освен ако вече нямате стартиран, в противен "
 "случай OSD няма да работи правилно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Не се изисква композитен мениджър за илюзийна прозрачност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Прозрачност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Илюзийна прозрачност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Истинска прозрачност (изисква разширение за X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Композитното разширение не е заредено"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитното разширение не е налично"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Позиция"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Декорация"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Активатор"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Разни"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Тест"
 
@@ -772,11 +782,11 @@ msgstr "ASXv1/ASXv2 Списъци"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Списъци (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Цвят</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Размит осцилоскоп"
 
@@ -800,15 +810,15 @@ msgstr "x1/10 дБ"
 msgid "Cut frequency:"
 msgstr "Честота на срез:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Анализ на спектъра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Аудио CD Приставка"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -831,118 +841,118 @@ msgstr ""
 "\n"
 "Това беше проект от Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Устройство</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Скорост на четене:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Презапис на устройството:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метаданни</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Използвай CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Използвай CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Използване на HTTP вместо CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сървър:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Път:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нуспех при откриване на cdio подсистема."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Невалиден Интернет адрес %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Запис %d не е намерен."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Записът %d е от данни."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Грешка при четене на audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Аудио Диск"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не може да бъде отворено CD устройство %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Не е намерено Audio CD устройство."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Неуспешно приключване на обозначаването на отвореното CD устройство."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Неуспех при извличане на първият/последният номер на запис."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не може да прочете началото/края на LSN за запис %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Неуспех при създаване на cddb връзка."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Неуспешна заявка към CDDB сървър"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Неуспешна заявка към CDDB сървър: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Неуспешно прочитане на cddb информация: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Устройството е празно."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Неподдържан диск."
 
@@ -1112,58 +1122,60 @@ msgstr "Наситеност:"
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Приставка за условности"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Изтриване на файлове"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Грешка при преместването на %s в коша: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Грешка при изтриването на %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Грешка при изтриването на %s: не е местен файл."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Искате ли да преместите избраните файлове в коша?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Преместване в Коша"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Искате ли окончателно да изтриете избраните файлове?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Изтриване на избраните файлове"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Начин на изтриване</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Премести в коша, вместо незабавно изтриване"
 
@@ -1205,11 +1217,11 @@ msgstr "Сила на звука:"
 msgid "Echo"
 msgstr "Ехо"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Приставка за FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1225,15 +1237,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Приставка FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Избор на папка"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1262,194 +1270,278 @@ msgstr ""
 "ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Формат на изходния файл:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Запамети в оригиналната директория"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Записване в потребителска директория:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Генерирай име на файл от:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Оригинално име на файл"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Оригинално име на файла (без наставка)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Етикет на оригиналния файл"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Прикрепване на номера на записа към името на файла"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Общи"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Автоматично"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Общо Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Алгоритъм за качество:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Изходна честота на дискретизация:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Хц)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Честота/Компресия:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Честота за бит (кбвс):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Честота на сгъстяване:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Режим на звука:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Разни:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Наложи придържане към ISO стандарт"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Грешна защита"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Качество"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Активиране VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Вид:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR Опции:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Минимална честота за бит (кбвс):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимална честота за бит (кбвс):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Придържане към минимална честота за бит"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR Опции:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Средна честота за бит (кбвс):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Ниво на качеството на VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Придържане към минимална честота за бит"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Пропусни титула на Xing VBR"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Стойности на рамката:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Маркер „Защитено от копиране“"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Маркер „Оригинал“"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 параметри:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Принудително добавяне на маркер от 2-ра версия"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Добави само маркер 1-ва версия"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Добави само маркер 2-ра версия"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Качество"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Маркери"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Ниво на качеството (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Общи"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Разкодиране на FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "по-малко загуби"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1461,7 +1553,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1469,19 +1561,19 @@ msgstr ""
 "Приставка GIO за Audacious\n"
 "Авторски права 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Приставка GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Не се поддържа режим на четене и прикрепяне"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Неправилен режим на отваряне"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1501,32 +1593,10 @@ msgstr ""
 "\n"
 "Лиценз: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL осцилоскоп"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL анализатор на спектъра за Audacious\n"
-"Запазени права 2013 Christophe Budé, John Lindgren, и Carlo Bramini\n"
-"Запазени права 2014 William Pitcock\n"
-"\n"
-"На основата на приставката за XMMS:\n"
-"Запазени права 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, и 4Front Technologies\n"
-"\n"
-"Лиценз: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Бързи клавиши за GNOME"
@@ -1547,8 +1617,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Номер на запис"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Заглавие"
@@ -1605,8 +1675,8 @@ msgstr "Налични колони"
 msgid "Displayed columns"
 msgstr "Показване колони"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Инструмент за търсене"
 
@@ -1634,335 +1704,338 @@ msgstr "Без панел"
 msgid "Disable"
 msgstr "Деактивиране"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Отваряне на файлове..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "От_варяне на интернет адрес..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Доба_вяне на файлове..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "_Добавяне на интернет адрес..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "_Библиотека за търсене"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "От_носно..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Настройки..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Изход"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "Въ_зпроизвеждане"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "В_ременно спиране"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Спиране"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Предишен"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Следващ"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Повт_орение"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Разбърка_но"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Разбъркване по _Албум"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_Без прескачане към следващо изпълнение"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Спри с_лед тази песен"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Информация за песен..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Пре_скачане до време..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Прескачане до п_есен..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Начална точка н_а повторение"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Крайна точка на повторе_ниe"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "Из_чистване на точките на повторение"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "По _заглавие"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "По _име на файл"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "По _път до файла"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "По _номер на запис"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "По _изпълнител"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "По ал_бум"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "По и_зпълнител на Албум"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "По _дата на издаване"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "По _жанр"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "По _времетраене"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "По _път до файла"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "По избрано з_аглавие"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Об_ръщане на подредбата"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Сл_учаен ред"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Възпроизвеждане/Възобновяване"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Опресняване"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Сортиране"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "По_дреждане на избраните"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Премахване на по_втарящи се"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Премахване на _липсващите файлове"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Нов"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Преименуване..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Премах_ване"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Внасяне..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Изнасяне..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Управление на списъка..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Управление на опашката..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Увеличаване на _звука"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Намаляване на з_вука"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Тонкоректор..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Е_фекти..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Запис на поток"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Настройки на _звук..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Показване на панел с _меню"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Показване на лента с _информация"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Показване на представяне в стълба с информация"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Показване на лента на _състоянието"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Пока_жи оставащо време"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "Виз_уализации..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "Въ_зпроизвеждане"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Списък"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Услуги"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Из_ходящ поток"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "Из_глед"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Промяна на състоянието в опашката"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Отвори папката със съдържанието"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "О_трязване"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Копиране"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "По_ставяне"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Избор на _всички"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "П_реименуване..."
 
@@ -2003,58 +2076,57 @@ msgstr "Превъртане със стрелките:"
 msgid "Scroll on song change"
 msgstr "Превъртане при смяна на песента"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK изглед"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Запълване..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "еднозвучие"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "многозвучие"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d канал"
 msgstr[1] "%d канали"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d кХц"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбвс"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Режим „Единичен“."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Режим „Списък“."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Спиране след песента."
 
@@ -2062,9 +2134,9 @@ msgstr "Спиране след песента."
 msgid "Previous track"
 msgstr "Предишен запис"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Изпълнение"
 
@@ -2072,8 +2144,8 @@ msgstr "Изпълнение"
 msgid "Pause/Resume"
 msgstr "Временно спиране/Възобновяване"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Спиране"
 
@@ -2173,7 +2245,7 @@ msgstr "<b>Обвързване на клавиш:</b>"
 msgid "_Add"
 msgstr "_Добавяне"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Общи бързи клавиши"
 
@@ -2203,25 +2275,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK Изход"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Автоматично свързване към изходящите портове"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Намерени са само изходни портове %d JACK, но се изискват %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Неуспешно свързване към JACK порт %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2229,11 +2301,11 @@ msgstr ""
 "JACK поддържа само звук с плаваща запетая. Трябва да смените изходната "
 "побитова честота на плаваща запетая в настройките на Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Неуспех при свързването към сървър JACK. Стартиран ли е?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2338,48 +2410,48 @@ msgstr "Повторно свързване към LIRC сървъра"
 msgid "Wait before reconnecting:"
 msgstr "Изчакайте преди да опитате повторно свързване:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Приставка LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Няма наличен текст"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Грешка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Неуспех при извличане на %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Неуспех при разделяне на %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Търсене на текст..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Липсващи метаданни за песента"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Свързване към lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Редактиране на текста..."
 
@@ -2391,17 +2463,17 @@ msgstr "Списък M3U"
 msgid "Tact Generator"
 msgstr "Генератор на тактове"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор на тактове: %d увм"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор на тактове: %d увм %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2556,15 +2628,15 @@ msgstr "Тези настройки ще влязат в сила, когато
 msgid "MPG123 Plugin"
 msgstr "Приставка MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Допълнителни</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Използвай точна калкулация на продължителността (бавно)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Обграждащ звук"
 
@@ -2576,35 +2648,35 @@ msgstr "Услуга MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Приставка Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Грешка при пренасочването"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Неизвестна HTTP грешка"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Грешка при онаследяване на интернет адрес"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Твърде много пренасочвания"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Спрян"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious не изпълнява нищо."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Уведомления на работния плот"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2639,15 +2711,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Показване на бутоните за управление"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Винаги да се показва известие"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Включи името на албума в уведомленията"
 
@@ -2655,21 +2727,21 @@ msgstr "Включи името на албума в уведомленията"
 msgid "Show"
 msgstr "Показване"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Временно спиране"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Следващ"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 изход"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 изход"
 
@@ -2711,23 +2783,23 @@ msgstr ""
 "Бих искал да благодаря на хората от #audacious, особено на Tony Vroon и John "
 "Lindgren и, разбира се, на авторите на предишната версия на приставката."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Мениджър на списъка"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Елементи"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Преименуван_е"
 
@@ -2739,49 +2811,34 @@ msgstr "Списъци PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Разкодиране OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio изход"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Изходна приставка PulseAudio за Audacious\n"
-"\n"
-"Тази програма е свободен софтуер; можете да я разпространявате и/или "
-"променяте\n"
-"според правата на GNU GPL, както е публикувано от FSF; включително\n"
-"за версия 2 на лиценза или всяка по-късна (според ваша преценка).\n"
-"\n"
-"Тази програма се разпространява с вярата, че ще бъде полезна,\n"
-"но БЕЗ КАКВАТО И ДА БИЛО ГАРАНЦИЯ; дори без да се включва гаранция за\n"
-"ПРОДАВАЕМОСТ или ЗА ЛИЧНИ ЦЕЛИ. За повече детайли вижте GNU GPL.\n"
-"\n"
-"Трябва да сте получили копие от GNU GPL редом с тази програма;\n"
-"ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia изход"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2795,47 +2852,73 @@ msgstr ""
 "На основата на приставка за SDL изход за Audacious\n"
 "Запазени права 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL анализатор на спектъра за Audacious\n"
+"Запазени права 2013 Christophe Budé, John Lindgren, и Carlo Bramini\n"
+"Запазени права 2014 William Pitcock\n"
+"\n"
+"На основата на приставката за XMMS:\n"
+"Запазени права 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, и 4Front Technologies\n"
+"\n"
+"Лиценз: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Работи ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Търсене"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Отвори папка..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Добави папка..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Инспектор на от_чети..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Отваряне на файлове"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Добавяне на файлове"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Предишен"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Повторение"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Разбъркване"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Отвори папка..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Добави папка..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Инспектор на от_чети..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt Интерфейс"
 
@@ -2879,7 +2962,7 @@ msgstr "<b>Обръщане</b>"
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Честота:"
 
@@ -2931,60 +3014,42 @@ msgstr "176.4 кХц:"
 msgid "192 kHz:"
 msgstr "192 кХц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Добре. Споделяне за потребител: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Нямате права"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Посетете връзката, за да позволите на Audacious, да споделя Вашите "
-"изпълнения:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Запазете този прозорец отворен и отново изберете „Проверка на права“.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не се притеснявайте. Вашите споделяния са запаметени на компютъра.\n"
-"Ще бъдат изпратени веднага след като на Audacious му бъде позволено."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Интернет проблем."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Възникна проблем при свързване с Last.fm. Опитайте по-късно."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверка..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "П_роверка на права"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Връщане на права"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Нужно е да позволите на Audacious да споделя записите във Вашият Last.fm "
-"профил.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3015,7 +3080,7 @@ msgstr ""
 "Благодарности на John Lindgren за оказаната помощ в този проект.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3023,11 +3088,11 @@ msgstr ""
 "Audacious използва подобрена версия на Споделяне на песни за Last.fm.\n"
 "Моля, проверете настройките на приставката за Споделяне на песни."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL изход"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3035,58 +3100,58 @@ msgstr ""
 "Изходна приставка SDL за Audacious\n"
 "Авторски права 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d резултат"
 msgstr[1] "%d резултати"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d скрит)"
 msgstr[1] "(%d скрити)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d песен"
 msgstr[1] "%d песни"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "на този жанр"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "на"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "от"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Създай списък"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Добавяне в списък"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Търсене в библиотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3094,11 +3159,11 @@ msgstr ""
 "За да внесете музикална библиотека в Audacious, изберете папка и кликнете на "
 "бутона \"Опресняване\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Моля изчакайте..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Избор на папка"
 
@@ -3194,15 +3259,15 @@ msgstr "Праг:"
 msgid "dB"
 msgstr "дБ"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Точките на повторение са изчистени."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Зададена е начална точка на повторение."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Зададена е крайна точка на повторение."
 
@@ -3254,373 +3319,381 @@ msgstr "16 кХц"
 msgid "Audacious Equalizer"
 msgstr "Тонкоректор на Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Превъртане до %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Сила на звука: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% ляво"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Баланс: център"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% дясно"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Меню с опции"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Деактивиране на „Винаги отгоре“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Активиране на „Винаги отгоре“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Кутийка с информация за файла"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Двоен Размер"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Визуализации"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Записване - включено"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Записване - изключено"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Усилване на звука"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Намаляне на звука"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Ефекти..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Запис на поток"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Настройки на звук..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Отваряне на файлове..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Отваряне на интернет адрес..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Търсене в библиотеката"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Възпроизвеждане"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Списък за изпълнение"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Изход"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Изглед"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Услуги"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Относно..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Настройки..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Изход"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Информация за песен..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Разбъркване по албум"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Без продължаване в списъка"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Спиране след тази песен"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Задаване на А-Б повторение"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Изчистване на А-Б повторение"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Прескачане до песен..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Прескачане до време..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Възпроизвеждане/Възобновяване"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Нов списък"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Преименуване на списък..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Премахване на списък..."
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Предишен списък"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Следващ списък"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Внасяне на списък..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Изнасяне на списък..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Мениджър на списъци..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Мениджър на опашките..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Опресняване на списък"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Показване на редактор на списъка"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Показване на тонкоректор"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Показвай оставащо време"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Винаги отгоре"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "На всички работни среди"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Свиване на плеър"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Свиване на редактора на списъци"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Свиване на тонкоректор"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Добавяне на интернет адрес..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Добавяне на файлове..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "По заглавие"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "По име на файл"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "По път до файл"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Премахване на всички"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Изчистване на опашката"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Премахване на липсващите файлове"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Премахване на повторения"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Премахване на неизбраните"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Премахване на избраните"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Търсене и избиране"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Обръщане на избраното"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Без избрани"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Избор на всички"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "По номер на записа"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "По изпълнител"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "По Албум"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "По изпълнител на албум"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "По дата на издаване"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "По жанр"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "По времетраене"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "По избрано заглавие"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Случаен списък"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Обръщане на списъка"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Подреждане на избраното"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Подреждане на списъка"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Поставяне"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "На опашка/без опашка"
 
@@ -3633,15 +3706,15 @@ msgstr "Audacious Редактор на списъка за изпълнение
 msgid "%s (%d of %d)"
 msgstr "%s (%d от %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Класически изглед на Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Отваряне на папка..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Добавяне на папка..."
 
@@ -3729,7 +3802,7 @@ msgid "Slow"
 msgstr "Бавно"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Средно"
 
@@ -3865,7 +3938,7 @@ msgstr "Създаване на нов списък със съвпадащит�
 msgid "Sndfile Plugin"
 msgstr "Приставка Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3904,62 +3977,62 @@ msgstr ""
 "ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio изход"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Устройство (празно - стойности по подразбиране):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Запази и възстанови силата на звука:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio грешка: неподдържан звуков формат (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio грешка: sio_open() се провали"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio грешка: sio_setpar() се провали"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio грешка: sio_start() се провали"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Промяна на песен"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Команди</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Команда за изпълнение при започване на нова песен:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Команда за изпълнение при край на песен:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Команда за изпълнение при край на списъка."
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Команда за изпълнение, когато се смени заглавието на песента (за интернет "
 "потоци):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3968,7 +4041,7 @@ msgstr ""
 "преди изпълнението на командата (не всички са полезни за команда след края "
 "на списъка):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3994,7 +4067,7 @@ msgstr ""
 "%t: Позиция в списъка\n"
 "%T: Заглавие (неформатирано)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4002,15 +4075,15 @@ msgstr ""
 "Параметрите предадени към обвивката, трябва да са заградени в кавички. "
 "Незаградените параметри биха довели до неочаквани резултати."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Информация за песента"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Преизчислител SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4024,43 +4097,43 @@ msgstr ""
 "Базиран на приставката за промяна на честотата:\n"
 "Авторски права 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Бързо"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Ниско"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Високо"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Много високо"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Скорост и нива"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Скорост и нива</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Скорост:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Нива:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Икона на състоянието"
 
@@ -4164,12 +4237,12 @@ msgstr "<b>Допълнително многозвучие</b>"
 msgid "Tone Generator"
 msgstr "Генератор на тонове"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Хц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор на тонове:"
 
@@ -4192,7 +4265,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Премахване на глас"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4269,7 +4342,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Разкодиране VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4279,19 +4352,29 @@ msgstr ""
 "На основата на in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
 "Приставка за Audacious от Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Разкодиране WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "със загуби (смесено)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "със загуби"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4305,32 +4388,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Разкодиране 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Настройки на XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Игнориране на дължината от файла"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Споделяеми списъци XML (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Плавното преминаване несполучи, защото песните имат различен брой канали. "
-#~ "Можете да използвате Смесителя на канали, за да превърнете броя им в общ "
-#~ "за всички песни."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Плавното преминаване несполучи, защото песните имат различна честота. "
-#~ "Можете да използвате Преобразувателя на честота, за да зададете обща "
-#~ "честота за всички песни."
diff --git a/po/ca.po b/po/ca.po
index f55176a..4b3eb96 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme-Barrientos, 2013
 # Catalanoic <catalanoic@gmail.com>, 2016
 # Catalanoic <catalanoic@gmail.com>, 2012
-# David Surroca Estrada <david.tb303@gmail.com>, 2015
+# David Surroca Estrada <david.tb303@gmail.com>, 2015-2016
 # Francesc Gordillo i Cortínez <inactive+frangor@transifex.com>, 2013
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2016-01-24 22:40+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-18 08:55+0000\n"
 "Last-Translator: Catalanoic <catalanoic@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/jlindgren/audacious/"
 "language/ca/)\n"
@@ -23,28 +24,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Descodificador d'AAC (Raw)"
 
 #: src/adplug/adplug-xmms.cc:42
 msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (AdLib Player)"
+msgstr "AdPlug (reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "seqüenciat"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
-msgstr "Configura Alarma ..."
+msgstr "Estableix l'alarma..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -53,9 +54,9 @@ msgstr ""
 "Un connector que pot ser utilitzat per iniciar la reproducció en qualsevol "
 "moment.\n"
 "\n"
-"Programat originalment per Adam Feakin i Daniel Stodden."
+"Escrit originalment per Adam Feakin i Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -107,7 +108,7 @@ msgid ""
 msgstr ""
 "Temps\n"
 "  Alarma a:\n"
-"    L'hora que s'encendrà l'alarma.\n"
+"    L'hora que s'activarà l'alarma.\n"
 "\n"
 "  Tranquil després de:\n"
 "    Atura alarma després d'aquest temps.\n"
@@ -124,172 +125,172 @@ msgstr ""
 "\n"
 "\n"
 "Volum\n"
-"  Increment:\n"
-"    Augmenta el volum seleccionat per aquest temps.\n"
+"  Esvaïment:\n"
+"    Esvaeix el volum seleccionat per aquest interval de temps.\n"
 "\n"
-"  Inicia a:\n"
-"    Inicia augmentant des d'aquest volum.\n"
+"  Comença per:\n"
+"    Inicia l'esvaïment a partir d'aquest volum.\n"
 "\n"
-"  Final:\n"
-"    El volum per aturar l'augment. Si l'augment de temps és 0 llavors "
-"selecciona aquest volum i s'inicia la reproducció.\n"
+"  Acabament:\n"
+"    El volum per aturar l'esvaïment. Si el temps d'esvaïment és 0 aleshores "
+"es selecciona aquest volum i s'inicia la reproducció.\n"
 "\n"
 "\n"
 "Opcions:\n"
-"  Instrucció addiconal:\n"
-"    Activa aquesta instrucció durant l'alarma.\n"
+"  Ordre addicional:\n"
+"    Activa aquesta ordre durant l'alarma.\n"
 "\n"
-"  Reproducció:\n"
-"    Carrega aquesta llista de reproducció. Si no hi ha cap llista, serà "
-"usada l'actual.\n"
+"  Llista de reproducció:\n"
+"    Carrega aquesta llista de reproducció. Si no hi ha cap llista, "
+"s'utilitzarà l'actual.\n"
 "    També es pot introduir aquí l'URL d'un flux mp3/ogg.\n"
 "\n"
 "  Recordatori:\n"
 "    Mostra un recordatori quan s'apaga l'alarma.\n"
-"    Escriviu el recordatori en el camp d'entrada i activa la casella so "
+"    Teclegeu el recordatori al camp d'entrada i habiliteu la casella si "
 "voleu que es mostri."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
-msgstr "Això és l'avís per despertar-se."
+msgstr "Aquest és el vostre avís per despertar."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
-msgstr "El vostre recordatori d'avui és.."
+msgstr "El vostre recordatori d'avui és..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Dilluns"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
-msgstr "Hora"
+msgstr "Temps"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma (per defecte) a les:"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Para al cap de:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "hores"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuts"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Trieu els dies que ha de saltar l'alarma"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dia"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Per defecte"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dies"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
-msgstr "Fosa"
+msgstr "Esvaïment"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segons"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volum"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
-msgstr "Comença a"
+msgstr "Comença per"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
-msgstr "Final"
+msgstr "Acabament"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Ordre addicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
-msgstr "activa"
+msgstr "habilita"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Llista de reproducció (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Selecciona una llista de reproducció"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opcions"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Què signifiquen aquestes opcions?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
-msgstr "Art del àlbum"
+msgstr "Art de l'àlbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sortida ALSA"
 
@@ -301,11 +302,11 @@ msgid ""
 "My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
 "code served as a reference when the ALSA manual was not enough."
 msgstr ""
-"ALSA Output Plugin for Audacious\n"
+"Connector de sortida ALSA per a Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"Molts agraïments a William Pitcock, autor de l'ALSA Output Plugin NG, el "
-"codi va servir de referència quan el manual d'ALSA no era suficient."
+"Molts agraïments a William Pitcock, autor del connector de sortida ALSA NG, "
+"el codi va servir de referència quan el manual d'ALSA no era suficient."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -331,11 +332,11 @@ msgstr "Dispositiu de mescla:"
 msgid "Mixer element:"
 msgstr "Element de mescla:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -376,68 +377,68 @@ msgstr ""
 "Tony Vroon\n"
 "per a la bona ajuda amb les proves alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Ignora el guany per defecte:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Ignora la polifonia per defecte:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr "Ignora el reverb per defecte:"
+msgstr "Ignora la reverberació per defecte:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Ignora el cor per defecte:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reproducció</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposició:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
-msgstr "semitones"
+msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Desplaçament de la percussió: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "nombres de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Salta silenci inicial"
+msgstr "Omet el silenci inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr "Salta silenci posterior"
+msgstr "Omet el silenci posterior"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetitzador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
-msgstr "Freqüència de mostra:"
+msgstr "Freqüència de mostreig:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -445,86 +446,106 @@ msgstr "Freqüència de mostra:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Connector AMIDI-Plug - Seleccioneu un fitxer SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Obre"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
-msgstr "Mida (octets)"
+msgstr "Mida (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Informació MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Durada (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
-msgstr "Num. de pistes:"
+msgstr "Nre. de pistes:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div temps:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Comentaris MIDI i lletres </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té comentaris *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té lletra *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Tan_car"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 no vàlid)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Navegador Ampache\n"
+"\n"
+"Client d'Ampache per a Audacious.\n"
+"\n"
+"Llicència: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský i John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -535,15 +556,15 @@ msgid ""
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"Audacious OSD\n"
+"OSD d'Audacious\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Programat per Giacomo Lozito <james@develia.org>\n"
 "\n"
-"Basat en part en la llibreria Ghosd d'Evan Martin:\n"
+"Basat en part en la biblioteca Ghosd d'Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -570,7 +591,7 @@ msgstr "Inici de la reproducció"
 #: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
-"Activa l'OSD quan es reprodueix una entrada de la llista de reproducció"
+"Dispara l'OSD quan es reprodueix una entrada de la llista de reproducció."
 
 #: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
@@ -579,174 +600,171 @@ msgstr "Canvi de títol"
 #: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
+"Dispara l'OSD quan canvia el nom de la cançó (per als fluxos d'Internet)."
 
 #: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pausa On"
+msgstr "Pausa engegada"
 
 #: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Activa l'OSD quan la reproducció està en pausa."
+msgstr "Dispara l'OSD quan la reproducció està en pausa."
 
 #: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Pausa Off"
+msgstr "Pausa apagada"
 
 #: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Activa l'OSD quan la reproducció deixa d'estar en pausa."
+msgstr "Dispara l'OSD quan la reproducció deixa d'estar en pausa."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Desplaçament relatiu X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Desplaçament relatiu Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Amplada màxima de l'OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opcions multi-monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Mostra l'OSD en:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "tots els monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "el monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Durada (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Visible:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
-msgstr "Fosa entrant:"
+msgstr "Esvaïment d'entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
-msgstr "Fosa sortint:"
+msgstr "Esvaïment de sortida:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
-msgstr "Foses"
+msgstr "Tipus de lletres"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
-msgstr "Fosa %i:"
+msgstr "Lletra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Ombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estil de representació"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colors"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
-msgstr "Habilita activador"
+msgstr "Habilita el disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
-msgstr "S'ha detectat un gestor Composite"
+msgstr "S'ha detectat un gestor de composicions"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
-"No s'ha detectat cap gestor Composite;\n"
-"tret que sapigueu que ja n'està funcionant un, activeu un gestor Composite o "
-"l'OSD no funcionarà correctament"
+"No s'ha detectat cap gestor de composicions;\n"
+"tret que sapigueu que ja n'està funcionant un, activeu un gestor de "
+"composicions o l'OSD no funcionarà correctament"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
-msgstr "La transparència simulada no requereix un gestor Composite"
+msgstr "La transparència simulada no requereix un gestor de composicions"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparència"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparència simulada"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Transparència real (requereix l'ext. X composite)"
+msgstr "Transparència real (requereix l'extensió de composicions de les X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
-msgstr "L'extensió Composite no està carregada"
+msgstr "L'extensió de composicions no està carregada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "L'extensió Composite no està disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
-msgstr "<span font_desc='%s'>OSD de l'Audacious</span>"
+msgstr "<span font_desc='%s'>OSD d'Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animació"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoració"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
-msgstr "Llançador"
+msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Prova"
 
@@ -762,21 +780,21 @@ msgstr "Llistes de reproducció ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Llistes de reproducció d'Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Color</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Oscil·loscopi difús"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "BS2B (Bauer Stereophonic-to-Binaural)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Predefinits:"
+msgstr "Valors preestablerts:"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -788,17 +806,17 @@ msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr "Tallar freqüència:"
+msgstr "Retalla la freqüència:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
-msgstr "Analitzador d'espectre"
+msgstr "Analitzador espectral"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
-msgstr "Connector de Àudio CD"
+msgstr "Connector de CD d'àudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -809,133 +827,142 @@ msgid ""
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> i altres.\n"
+"\n"
+"Moltes gràcies als desenvolupadors de libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"i als desenvolupadors de libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"També moltes gràcies a Tony Vroon per a assessorar-me i guiar-me.\n"
+"\n"
+"Aquest va ser un projecte de Google Summer of Code del 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositiu</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocitat de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
-msgstr "Dispositiu ignorat:"
+msgstr "Anul·la el dispositiu:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadades</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
-msgstr "Usa CD-Text"
+msgstr "Utilitza CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
-msgstr "Usa CDDB"
+msgstr "Utilitza CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
-msgstr "Usa HTTP en lloc de CDDBP"
+msgstr "Utilitza HTTP en lloc de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Camí:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
-msgstr "S'ha produït un error en inicialitzar el subsistema de cdio."
+msgstr "No s'ha pogut iniciar el subsistema de cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
-msgstr "L’URI %s no és vàlid."
+msgstr "L'URI %s no és vàlid."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
-msgstr "No s’ha trobat la pista %d."
+msgstr "No s'ha trobat la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La pista %d és una pista de dades."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
-msgstr "S'ha produït un error llegint el CD d'àudio."
+msgstr "Error en llegir el CD d'àudio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
-msgstr "CD d'audio"
+msgstr "CD d'àudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr "S'ha produït un error en obrir el dispositiu de CD %s."
+msgstr "No s'ha pogut obrir el dispositiu de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
-msgstr "No s'ha trobat unitat de CD d'àudio."
+msgstr "No s'ha trobat cap unitat de CD d'àudio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
-msgstr "S'ha produït un error en finalitzar inicialitzar la unitat CD oberta."
+msgstr "No s'ha pogut acabar la inicialització de la unitat CD oberta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
-msgstr "S'ha produït un error en recuperar el primer/últim número de pista."
+msgstr "No s'ha pogut recuperar el primer/últim número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No s'ha pogut llegir el LSN d'inici/fi per la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
-msgstr "S'ha produït un error en crear la connexió de cddb."
+msgstr "No s'ha pogut crear la connexió de cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
-msgstr "S'ha produït un error en trametre el servidor CDDB"
+msgstr "No s'ha pogut consultar al servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "S'ha produït un error en trametre el servidor CDDB: %s"
+msgstr "No s'ha pogut consultar al servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr "S'ha produït un error en llegir la info de cddb: %s"
+msgstr "No s'ha pogut llegir la informació de cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "La unitat està buida."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipus de disc no admès."
 
 #: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Paràmetres de menú del CD d'Àudio"
+msgstr "Elements de menú del CD d'Àudio"
 
 #: src/cd-menu-items/cd-menu-items.cc:45
 msgid "Play CD"
-msgstr "Reprodueix CD"
+msgstr "Reprodueix el CD"
 
 #: src/cd-menu-items/cd-menu-items.cc:45
 msgid "Add CD"
-msgstr "Afegeix CD"
+msgstr "Afegeix el CD"
 
 #: src/compressor/compressor.cc:45
 msgid "<b>Compression</b>"
@@ -943,7 +970,7 @@ msgstr "<b>Compressió</b>"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Centrar volum"
+msgstr "Centra el volum:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
@@ -954,7 +981,7 @@ msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Dynamic Range Compression Plugin for Audacious\n"
+"Connector de compressió d'interval dinàmic per a Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
@@ -995,11 +1022,11 @@ msgstr "Durada per defecte:"
 
 #: src/console/plugin.cc:42 src/modplug/plugin_main.cc:62
 msgid "<b>Resampling</b>"
-msgstr "<b>Remostratge</b>"
+msgstr "<b>Remostreig</b>"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Activa el remostratge d'àudio"
+msgstr "Habilita el remostreig de l'àudio"
 
 #: src/console/plugin.cc:49
 msgid "<b>SPC</b>"
@@ -1029,35 +1056,35 @@ msgid ""
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"CoreAudio Output Plugin for Audacious\n"
+"Connector de sortida CoreAudio per a Audacious\n"
 "Copyright 2014 William Pitcock\n"
 "\n"
-"Based on SDL Output Plugin for Audacious\n"
+"Basat en el connector de sortida SDL per a Audacious\n"
 "Copyright 2010 John Lindgren"
 
 #: src/coreaudio/coreaudio.cc:143
 msgid "Use exclusive mode"
-msgstr "Utilitzar mode exclusiu"
+msgstr "Utilitza el mode exclusiu"
 
 #: src/crossfade/crossfade.cc:43
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Crossfade Plugin for Audacious\n"
+"Connector de fusió entre cançons per a Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
 #: src/crossfade/crossfade.cc:47
 msgid "<b>Crossfade</b>"
-msgstr "<b>Crossfade</b>"
+msgstr "<b>Fusió entre cançons</b>"
 
 #: src/crossfade/crossfade.cc:48
 msgid "On automatic song change"
-msgstr "En canviar automàticament de cançó"
+msgstr "Amb el canvi automàtic de la cançó"
 
 #: src/crossfade/crossfade.cc:50 src/crossfade/crossfade.cc:56
 msgid "Overlap:"
-msgstr "Solapar:"
+msgstr "Solapa:"
 
 #: src/crossfade/crossfade.cc:54
 msgid "On seek or manual song change"
@@ -1065,19 +1092,19 @@ msgstr "Cerca o canvi de cançó manual"
 
 #: src/crossfade/crossfade.cc:60
 msgid "<b>Tip</b>"
-msgstr "<b>Suggerència</b>"
+msgstr "<b>Consell</b>"
 
 #: src/crossfade/crossfade.cc:61
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
-"Per a un millor crossfading, activeu\n"
+"Per a una millor fusió entre cançons, activeu\n"
 "l'efecte d'eliminació de silenci."
 
 #: src/crossfade/crossfade.cc:71
 msgid "Crossfade"
-msgstr "Crossfade"
+msgstr "Fusió entre cançons"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "<b>Crystalizer</b>"
@@ -1091,60 +1118,62 @@ msgstr "Intensitat:"
 msgid "Crystalizer"
 msgstr "Cristal·litzador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
-msgstr "Cue Sheet Plugin"
+msgstr "Connector de full CUE"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
-msgstr "Esborra arxius"
+msgstr "Suprimeix fitxers"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
-msgstr "S'ha produït un error movent %s a la papelera: %s."
+msgstr "Error en moure %s a la paperera: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
-msgstr "S'ha produït un error suprimint %s: %s."
+msgstr "Error en suprimir %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
-msgstr "S'ha produït un error suprimint %s: no és un arxiu local."
+msgstr "Error en suprimir %s: no és un fitxer local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
-msgstr "Voleu moure els arxius seleccionats a la Papelera?"
+msgstr "Voleu moure els fitxers seleccionats a la paperera?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
-msgstr "Mou a la Papelera"
+msgstr "Mou a la paperera"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
-msgstr "Voleu eliminar permanentment els arxius seleccionats?"
+msgstr "Voleu suprimir permanentment els fitxers seleccionats?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
-msgstr "Suprimeix els arxius seleccionats"
+msgstr "Suprimeix els fitxers seleccionats"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
-msgstr "<b>Mètode d'esborrament</b>"
+msgstr "<b>Mètode de supressió</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
-msgstr "Mou a la Papelera en comptes de suprimir immediatament"
+msgstr "Mou a la paperera en comptes de suprimir immediatament"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1153,10 +1182,10 @@ msgid ""
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
-"Echo Plugin\n"
+"Connector d'eco\n"
 "Per Johan Levin, 1999\n"
 "Eco envolvent per Carl van Schaik, 1999\n"
-"Actualitzat per l'Audacious per William Pitcock i John Lindgren, 2010-2014"
+"Actualitzat per a Audacious per William Pitcock i John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "<b>Echo</b>"
@@ -1184,11 +1213,11 @@ msgstr "Volum:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Connector FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1197,22 +1226,18 @@ msgid ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Connector de descodificació d'àudio multiformat per l'Audacious usant el\n"
-"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"Connector de descodificació d'àudio multiformat per a Audacious mitjançant\n"
+"el marc de treball multimèdia de FFmpeg (http://www.ffmpeg.org/)\n"
 "\n"
-"Connector de l'Audacious per:\n"
+"Connector d'Audacious per:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Connector FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Trieu un directori"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1228,195 +1253,292 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Aquest programa és programari lliure; vostè pot redistribuir-lo i/o "
+"modificar-lo sota els termes de la GNU General Public License segons el "
+"publicat per la Free Software Foundation; ja sigui la versió 2 de la "
+"Llicència, o (a la seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest programa es distribueix amb l'esperança que serà útil, però SENSE CAP "
+"GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o APTITUD "
+"PER A UN PROPÒSIT PARTICULAR.  Vegeu la GNU General Public License per a més "
+"detalls.\n"
+"\n"
+"Haurieu de rebre una còpia de la GNU General Public License juntament amb "
+"aquest programa; si no, podeu escriure la Free Software Foundation, Inc., 51 "
+"Franklin Street, Cinquena Planta, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Format del fitxer de sortida:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Desa al directori original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
-msgstr "Desa a un altre directori"
+msgstr "Desa a un altre directori:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Agafa el nom del fitxer de:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nom del fitxer original"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
-msgstr "Nom del fitxer original (sense suffix)"
+msgstr "Nom del fitxer original (sense sufix)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta del fitxer original"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Precedeix el nombre de pista pel nom del fitxer"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "General"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Estèreo conjunt"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estèreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Qualitat de l'algoritme:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Freqüència de mostra de sortida:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Flux de bits / Ràtio de compressió:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Qualitat de l'algoritme:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Flux de bits (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Ràtio de compressió:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Mode d'àudio:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Miscel·lània:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Força el compliment estricte de l'estàndard ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Protecció d'errors"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualitat"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
-msgstr "Activa VBR/ABR"
+msgstr "Habilita VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opcions VBR:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Taxa de bits mínima:"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Flux de bits mínim (kbps):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Taxa de bits màxima:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Flux de bits màxim (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Taxa de bits mitjana:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Compliment estricte el flux de bit mínim"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opcions ABR:"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Flux de bits mitjà (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nivell de qualitat VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Estricte compliment de la taxa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omet escriure la capçalera VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Paràmetres dels marcs:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Capçaleres dels marcs</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marca com a copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marca com a original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Etiquetes ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Etiquetes ID3 </b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
-msgstr "Força l'afegit d'etiquetes ID3 versió 2"
+msgstr "Força l'addició de les etiquetes de la versió 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
-msgstr "Només etiquetes v1"
+msgstr "Només afegeix l'etiqueta v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
-msgstr "Només etiquetes v2"
+msgstr "Només afegeix l'etiqueta v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualitat"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nivell de qualitat (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Qualitat (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sense pèrdues"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1428,27 +1550,27 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"GIO Plugin per l'Audacious\n"
+"Connector GIO per a Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Connector GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Mode de Llegir i annexar no compatible"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr "Mode d'obrir no vàlid"
+msgstr "Mode d'obriment no vàlid"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1459,27 +1581,22 @@ msgid ""
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
-msgid "OpenGL Spectrum Analyzer"
-msgstr "Analitzador d’espectre OpenGL"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"Copyright 2013 Christophe Budé, John Lindgren, i Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
+"Basat en el plugin XMMS:\n"
+"Drets d'autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, "
+"i 4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
+"Llicència: GPLv2+"
+
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analitzador espectral d'OpenGL"
 
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
-msgstr "Dreceres del GNOME"
+msgstr "Dreceres de GNOME"
 
 #: src/gnomeshortcuts/gnomeshortcuts.cc:54
 msgid ""
@@ -1488,8 +1605,8 @@ msgid ""
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
-"Connector de Dreceres del GNOME\n"
-"Perment controlar el reproductor amb les dreceres del GNOME.\n"
+"Connector de dreceres de GNOME\n"
+"Permet controlar el reproductor amb les dreceres de GNOME.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
@@ -1497,8 +1614,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número d'entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Títol"
@@ -1537,7 +1654,7 @@ msgstr "Durada"
 
 #: src/gtkui/columns.cc:45
 msgid "File path"
-msgstr "Camí del fitxer"
+msgstr "Camí al fitxer"
 
 #: src/gtkui/columns.cc:47
 msgid "Custom title"
@@ -1545,7 +1662,7 @@ msgstr "Títol personalitzat"
 
 #: src/gtkui/columns.cc:48
 msgid "Bitrate"
-msgstr "Flux de bits"
+msgstr "Taxa de bits"
 
 #: src/gtkui/columns.cc:313
 msgid "Available columns"
@@ -1555,8 +1672,8 @@ msgstr "Columnes disponibles"
 msgid "Displayed columns"
 msgstr "Columnes mostrades"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Eina de cerca"
 
@@ -1582,450 +1699,452 @@ msgstr "Desacoblar"
 
 #: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:534
 msgid "Disable"
-msgstr "Desactivar"
+msgstr "Inhabilita"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
-msgstr "_Obrir Fitxers..."
+msgstr "_Obre els fitxers..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
-msgstr "Obrir _URL..."
+msgstr "Obre l'_URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
-msgstr "_Afegir fitxers..."
+msgstr "_Afegeix els fitxers..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
-msgstr "Afegir U_RL..."
+msgstr "Afegeix l'U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
-msgstr "Cerca _biblioteca"
+msgstr "Cerca la bib_lioteca"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Quant a..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
-msgstr "_Opcions ..."
+msgstr "Ajust_s..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Surt"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
-msgstr "Repro_duir"
+msgstr "Re_produeix"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Pausa"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Atura"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Anterior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Següent"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
-msgstr "_Repetir"
+msgstr "_Repeteix"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
-msgstr "_Mesclar"
+msgstr "Or_dre aleatori"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
-msgstr "Baralla per Àlbu_m"
+msgstr "Ordre aleatori per àlbu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
-msgstr "No ava_nçar la llista de reproducció"
+msgstr "N_o avancis la llista de reproducció"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
-msgstr "Parar després de la cançó."
+msgstr "Atura d_esprés d'aquesta cançó."
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informació de la cançó..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
-msgstr "_Salta al temps..."
+msgstr "Salta a l'ins_tant..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Salta a la _cançó..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
-msgstr "Estableix punt de repetició _A"
+msgstr "Estableix el punt de repetició _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
-msgstr "Estableix punt de repetició _B"
+msgstr "Estableix el punt de repetició _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
-msgstr "_Neteja punts de repetició"
+msgstr "Neteja els punts de repeti_ció"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Per _títol"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Per nom de _fitxer"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
-msgstr "Per _camí del fitxer"
+msgstr "_Per camí al fitxer"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
-msgstr "Pel número de _pista"
+msgstr "Per número de _pista"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
-msgstr "Per l'_artista"
+msgstr "Per _artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Per àl_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Per artista d'àlbu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
-msgstr "Per la _data"
+msgstr "Per _data de llançament"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Per _gènere"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Per _longitud"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Per nom de _fitxer"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Per títol _personalitzat"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Ordre _invers"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Ordre alea_tori"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
-msgstr "_Pausa/Represa"
+msgstr "Re_produeix/reprèn"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
-msgstr "A_ctualitzar"
+msgstr "_Refresca"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
-msgstr "_Ordenar"
+msgstr "_Ordena"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
-msgstr "Ordena els seleccionats"
+msgstr "Ordena els se_leccionats"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
-msgstr "Treu els duplicats"
+msgstr "Treu els _duplicats"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
-msgstr "Eliminar fitxers _no disponibles"
+msgstr "Elimina els fitxers _no disponibles"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nou"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
-msgstr "Reanomena ..."
+msgstr "Re_anomena..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
-msgstr "Suprimeix"
+msgstr "Suprimei_x"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
-msgstr "_Importar..."
+msgstr "_Importa..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
-msgstr "_Exportar..."
+msgstr "_Exporta..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
-msgstr "Gestor de llistes de reproducció ..."
+msgstr "_Gestor de llistes de reproducció..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Gestor de _cues..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
-msgstr "P_ujar volum"
+msgstr "Apuja vol_um"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
-msgstr "_Baixar volum"
+msgstr "A_baixa el volum"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
-msgstr "_Equalitzador"
+msgstr "_Equalitzador..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
-msgstr "E_fectes ..."
+msgstr "E_fectes..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
-msgstr "_Flux de gravació"
+msgstr "En_registra el flux"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
-msgstr "Opcions d'àudio"
+msgstr "Ajust_s de l'àudio..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
-msgstr "_Mostrar barra de menú"
+msgstr "_Mostra la barra de menús"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
-msgstr "Mostrar barra d'_informació"
+msgstr "Mostra la barra d'_informació"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
-msgstr "Mostrar visualització de barra d'_informació"
+msgstr "Mostra la visualització de la barra d'_informació"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
-msgstr "Mostrar barra d'_estat"
+msgstr "Mostra la barra d'_estat"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostra el temps _restant"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
-msgstr "_Visualitzacions ..."
+msgstr "_Visualitzacions..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reproducció"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Llista de reproducció"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servei"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Sorti_da"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
-msgstr "_Veure"
+msgstr "_Visualitza"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
-msgstr "_Enviar/Treure de la cua"
+msgstr "Afegeix/treu de la _cua"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
-msgstr "_Obre carpeta"
+msgstr "_Obre la carpeta"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Refresca els seleccionats"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
-msgstr "Re_tallar"
+msgstr "Re_talla"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
-msgstr "_Copiar"
+msgstr "_Copia"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
-msgstr "_Enganxar"
+msgstr "_Enganxa"
+
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "_Enganxa a l'acabament"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
-msgstr "Seleccionar _tot"
+msgstr "Selecciona-ho _tot"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
-msgstr "_Reanomena ..."
+msgstr "_Reanomena..."
 
 #: src/gtkui/settings.cc:35 src/qtui/settings.cc:53
 msgid "<b>Playlist Tabs</b>"
-msgstr "<b>Pestanyes de llista de reproducció</b>"
+msgstr "<b>Pestanyes de la llista de reproducció</b>"
 
 #: src/gtkui/settings.cc:36 src/qtui/settings.cc:55
 msgid "Always show tabs"
-msgstr "Sempre mostra pestanyes"
+msgstr "Mostra sempre les pestanyes"
 
 #: src/gtkui/settings.cc:38 src/qtui/settings.cc:58
 msgid "Show entry counts"
-msgstr "Mostra comptadors d'entrada"
+msgstr "Mostra els comptadors de les entrades"
 
 #: src/gtkui/settings.cc:40 src/qtui/settings.cc:60
 msgid "Show close buttons"
-msgstr "Mostra botons de tancar"
+msgstr "Mostra els botons de tancament"
 
 #: src/gtkui/settings.cc:42 src/qtui/settings.cc:62
 msgid "<b>Playlist Columns</b>"
-msgstr "<b>Columnes de llista de reproducció</b>"
+msgstr "<b>Columnes de la llista de reproducció</b>"
 
 #: src/gtkui/settings.cc:44 src/qtui/settings.cc:64
 msgid "Show column headers"
-msgstr "Mostrar capçaleres de columna"
+msgstr "Mostra les capçaleres de les columnes"
 
 #: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:109
 #: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscel·lània</b>"
+msgstr "<b>Altres</b>"
 
 #: src/gtkui/settings.cc:47
 msgid "Arrow keys seek by:"
-msgstr "Cerca de tecles de fletxa per:"
+msgstr "Les tecles de les fletxes desplacen:"
 
 #: src/gtkui/settings.cc:50
 msgid "Scroll on song change"
-msgstr "Avança al canviar de cançó"
+msgstr "Desplaça amb el canvi de cançó"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
-msgstr "Interfície GTK"
+msgstr "Interfície de GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Gestió de memòria intermèdia..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estèreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canals"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
-msgstr "Mode únic"
+msgstr "Mode únic."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
-msgstr "Mode de llista de reproducció"
+msgstr "Mode de llista de reproducció."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
-msgstr "Parar després de la cançó."
+msgstr "Aturada després de la cançó."
 
 #: src/hotkey/gui.cc:71
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reprodueix"
 
 #: src/hotkey/gui.cc:73
 msgid "Pause/Resume"
-msgstr "Pausa/Represa"
+msgstr "Pausa/reprèn"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
-msgstr "Para"
+msgstr "Atura"
 
 #: src/hotkey/gui.cc:75
 msgid "Next track"
@@ -2045,11 +2164,11 @@ msgstr "Silencia"
 
 #: src/hotkey/gui.cc:79
 msgid "Volume up"
-msgstr "Puja el volum"
+msgstr "Apuja el volum"
 
 #: src/hotkey/gui.cc:80
 msgid "Volume down"
-msgstr "Baixa el volum"
+msgstr "Abaixa el volum"
 
 #: src/hotkey/gui.cc:81
 msgid "Jump to file"
@@ -2069,11 +2188,11 @@ msgstr "Activa repetició"
 
 #: src/hotkey/gui.cc:85
 msgid "Toggle shuffle"
-msgstr "Activa barreja"
+msgstr "Commuta l'ordre aleatori"
 
 #: src/hotkey/gui.cc:86
 msgid "Toggle stop after current"
-msgstr "Para quan s'acabi la cançó"
+msgstr "Commuta l'aturada després de l'actual"
 
 #: src/hotkey/gui.cc:87
 msgid "Raise player window(s)"
@@ -2123,7 +2242,7 @@ msgstr "<b>Vinculació de tecles:</b>"
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Tecles ràpides globals"
 
@@ -2154,49 +2273,54 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Sortida JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Connecta automàticament els ports de sortida"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr "Només s'han trobat %d ports de sortida de JACK però es necessiten %d"
+msgstr "Només s'han trobat %d ports de sortida JACK però es necessiten %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr "S'ha produït un error en connectar al port JACK %s."
+msgstr "No s'ha pogut connectar al port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK només és compatible amb àudio de punt flotant. Heu de canviar la "
+"profunditat de bits de sortida de punt flotant en la configuració d'Audacity."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "No s'ha pogut connectar al servidor JACK; està en execució?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz.  Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"El servidor JACK requereix una freqüència de mostreig de %d Hz, però "
+"l'Audacious està reproduint a %d Hz.  Utilitzeu l'efecte convertidor de "
+"freqüència demostra per corregir el desajust."
 
 #: src/ladspa/plugin.cc:415
 #, c-format
 msgid "%s Settings"
-msgstr "Paràmetres %s"
+msgstr "Ajusts %s"
 
 #: src/ladspa/plugin.cc:481
 msgid "Module paths:"
-msgstr "Camí de mòduls:"
+msgstr "Camí als mòduls:"
 
 #: src/ladspa/plugin.cc:486
 msgid ""
@@ -2204,6 +2328,10 @@ msgid ""
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins.</small>"
 msgstr ""
+"<small>Separa múltiples camins amb dos punts.\n"
+"Aquests camins són buscats, a més de LADSPA_PATH.\n"
+"Després de l'addició de nous camins, premeu Intro per explorar a la recerca "
+"de nous connectors.</small>"
 
 #: src/ladspa/plugin.cc:502
 msgid "Available plugins:"
@@ -2213,7 +2341,7 @@ msgstr "Connectors disponibles: "
 #: src/modplug/plugin_main.cc:98 src/modplug/plugin_main.cc:101
 #: src/modplug/plugin_main.cc:104
 msgid "Enable"
-msgstr "Activa"
+msgstr "Habilita"
 
 #: src/ladspa/plugin.cc:521
 msgid "Enabled plugins:"
@@ -2221,13 +2349,15 @@ msgstr "Connectors habilitats:"
 
 #: src/ladspa/plugin.cc:537
 msgid "Settings"
-msgstr "Configuració"
+msgstr "Ajusts"
 
 #: src/ladspa/plugin.cc:554
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"Amfitrió LADSPA per a Audacious\n"
+"Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2252,10 +2382,10 @@ msgid ""
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Un connector simple per controlar l'Audacious utilitzant el dimoni de "
-"control remot LIRC\n"
+"Un connector simple per controlar Audacious mitjançant el dimoni de "
+"comandament remot LIRC\n"
 "\n"
-"Adaptat per l'Audacious per:\n"
+"Adaptat per a Audacious per:\n"
 "Tony Vroon <chainsaw@gentoo.org>\n"
 "Joonas Harjumäki <jharjuma@gmail.com>\n"
 "\n"
@@ -2264,7 +2394,7 @@ msgstr ""
 "Christoph Bartelmus <xmms@bartelmus.de>\n"
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
-"Per obtenir més informació sobre LIRC, vegeu http://lirc.org."
+"Per a més informació sobre LIRC, vegeu http://lirc.org."
 
 #: src/lirc/lirc.cc:393
 msgid "<b>Connection</b>"
@@ -2272,56 +2402,56 @@ msgstr "<b>Connexió</b>"
 
 #: src/lirc/lirc.cc:394
 msgid "Reconnect to LIRC server"
-msgstr "Reconnecta amb el servidor LIRC"
+msgstr "Reconnecta al servidor LIRC"
 
 #: src/lirc/lirc.cc:396
 msgid "Wait before reconnecting:"
-msgstr "Temps d'espera abans d'intentar reconnectar: "
+msgstr "Espera abans de la reconnexió:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Connector LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "No hi ha lletres disponibles"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Error"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "No és possible capturar %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "No es pot analitzar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
-msgstr "S'està cercant lletres ..."
+msgstr "S'estan cercant les lletres..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Hi ha metadades de cançó desaparegudes"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "S'està connectant a lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
-msgstr "Edita lletres ..."
+msgstr "Edita les lletres..."
 
 #: src/m3u/m3u.cc:32
 msgid "M3U Playlists"
@@ -2329,19 +2459,19 @@ msgstr "Llistes de reproducció M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr "Generador de tons:"
+msgstr "Generador de tactes"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de compassos: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de compassos: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2349,20 +2479,27 @@ msgid ""
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"Un generador de tacte per Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Per usar-lo, afegiu una URL: tact://beats*num/den\n"
+"e.g. tact://77 per reproduir 77 batecs per minut\n"
+"o tact://60*3/4 per reproduir 60 bpm en 3/4 tactes"
 
 #: src/mixer/mixer.cc:38
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Mesclador de canals"
 
 #: src/mixer/mixer.cc:227
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Channel Mixer Plugin for Audacious\n"
+"Drets d'autor 2011-2012 John Lindgren i Michał Lipski"
 
 #: src/mixer/mixer.cc:231
 msgid "<b>Channel Mixer</b>"
-msgstr ""
+msgstr "<b>Mesclador de canals</b>"
 
 #: src/mixer/mixer.cc:232
 msgid "Output channels:"
@@ -2374,11 +2511,11 @@ msgstr "Connector MMS"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Error en connectar al servidor MMS"
 
 #: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
+msgstr "ModPlug (Reproductor mòdul)"
 
 #: src/modplug/plugin_main.cc:56
 msgid "<b>Resolution</b>"
@@ -2386,11 +2523,11 @@ msgstr "<b>Resolució</b>"
 
 #: src/modplug/plugin_main.cc:57
 msgid "8-bit"
-msgstr "8 bit"
+msgstr "8 bits"
 
 #: src/modplug/plugin_main.cc:58
 msgid "16-bit"
-msgstr "16 bit"
+msgstr "16 bits"
 
 #: src/modplug/plugin_main.cc:59
 msgid "<b>Channels</b>"
@@ -2414,7 +2551,7 @@ msgstr "Polifase (millor)"
 
 #: src/modplug/plugin_main.cc:67
 msgid "<b>Sample rate</b>"
-msgstr "<b>Freqüència de mostra</b>"
+msgstr "<b>Freqüència de mostreig</b>"
 
 #: src/modplug/plugin_main.cc:68
 msgid "22 kHz"
@@ -2439,19 +2576,19 @@ msgstr "Nivell:"
 
 #: src/modplug/plugin_main.cc:81
 msgid "Cutoff:"
-msgstr "Tallar:"
+msgstr "Tall:"
 
 #: src/modplug/plugin_main.cc:94
 msgid "<b>Reverb</b>"
-msgstr "<b>Reverb</b>"
+msgstr "<b>Reverberació</b>"
 
 #: src/modplug/plugin_main.cc:97
 msgid "<b>Bass Boost</b>"
-msgstr "<b>Bass Boost</b>"
+msgstr "<b>Increment de baixos</b>"
 
 #: src/modplug/plugin_main.cc:100
 msgid "<b>Surround</b>"
-msgstr "<b>Surround</b>"
+msgstr "<b>Envoltant</b>"
 
 #: src/modplug/plugin_main.cc:103
 msgid "<b>Preamp</b>"
@@ -2459,23 +2596,23 @@ msgstr "<b>Preamplificador</b>"
 
 #: src/modplug/plugin_main.cc:110
 msgid "Oversample"
-msgstr "Sobremostra"
+msgstr "Sobremostreig"
 
 #: src/modplug/plugin_main.cc:111
 msgid "Noise reduction"
-msgstr "Reducció de soroll"
+msgstr "Reducció del soroll"
 
 #: src/modplug/plugin_main.cc:112
 msgid "Play Amiga MODs"
-msgstr "Reprodueix Amiga MODs"
+msgstr "Reprodueix els MOD d'Amiga"
 
 #: src/modplug/plugin_main.cc:113
 msgid "<b>Repeat</b>"
-msgstr "<b>Repeteix</b>"
+msgstr "<b>Repetició</b>"
 
 #: src/modplug/plugin_main.cc:114
 msgid "Repeat count:"
-msgstr "Comptatge de repeticions:"
+msgstr "Nombre de repeticions:"
 
 #: src/modplug/plugin_main.cc:115
 msgid "To repeat forever, set the repeat count to -1."
@@ -2483,23 +2620,23 @@ msgstr "Per repetir indefinidament, definiu el nombre a -1."
 
 #: src/modplug/plugin_main.cc:128 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "Aquests ajusts tindran efecte quan es reiniciï Audacious."
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Connector MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avançat</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Utilitza el càlcul acurat de la longitud (lent)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
-msgstr "So envolvent"
+msgstr "Envoltant"
 
 #: src/mpris2/plugin.cc:38
 msgid "MPRIS 2 Server"
@@ -2507,37 +2644,37 @@ msgstr "Servidor MPRIS 2"
 
 #: src/neon/neon.cc:97
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Connector HTTP/HTTPS de Neon"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Error en analitzar la redirecció:"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Error HTTP desconegut"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Error en analitzar l'URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Massa redireccions"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Aturat"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious no està reproduint."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificacions d'escriptori"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2556,38 +2693,54 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Desktop Notifications Plugin for Audacious\n"
+"Drets d'autor (C) 2010 Maximilian Bogner\n"
+"Drets d'autor (C) 2011-2013 John Lindgren i Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Aquest connector és programari lliure: podeu redistribuir-lo i/o modificar-"
+"lo sota els termes de la Llicència pública general de GNU com és publicada "
+"per la Free Software Foundation, bé de la versió 3 de la Llicència, o (a la "
+"seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest connector es distribueix amb l'esperança que serà útil, però SENSE "
+"CAP GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o "
+"APTITUD DE PROPÒSIT PARTICULAR.  Vegeu la Llicència general pública de GNU "
+"per a més detalls.\n"
+"\n"
+"Haurieu de rebre una còpia de la llicència pública general GNU amb aquest "
+"programa. Si no és així, consulteu <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
-msgstr ""
+msgstr "Mostra els controls de reproducció"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
-msgstr ""
+msgstr "Mostra sempre la notificació"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Inclou el nom de l'àlbum a la notificació"
 
 #: src/notify/osd.cc:58
 msgid "Show"
 msgstr "Mostra"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Següent"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Sortida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Sortida OSS3"
 
@@ -2601,19 +2754,19 @@ msgstr "Dispositiu d'àudio:"
 
 #: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Usa un dispositiu alternatiu:"
+msgstr "Utilitza un dispositiu alternatiu:"
 
 #: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Desa el volum entre les sessions."
 
 #: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "Activar conversions de format realitzades pel programari OSS."
+msgstr "Habilita les conversions de format realitzades amb el programari OSS."
 
 #: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Habilita el mode exclusiu per evitar la mescla virtual."
 
 #: src/oss4/plugin.cc:101
 msgid ""
@@ -2624,25 +2777,25 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gestor de llistes de reproducció"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Elements"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
-msgstr "Ranomena"
+msgstr "Re_anomena"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
@@ -2652,35 +2805,34 @@ msgstr "Llistes de reproducció PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Sortida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
-msgstr "Sortida QtMultimedia"
+msgstr "Sortida de QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2689,65 +2841,82 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
-msgstr "S'està treballant ..."
+msgstr "S'està treballant..."
+
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informació"
 
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Cerca"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Obre carpeta ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Afegeix carpeta ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Log Inspector ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Obre els fitxers"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Afegeix els fitxers"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repeteix"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
-msgstr "Barreja"
+msgstr "Ordre aleatori"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Obre la carpeta..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Afegeix la carpeta..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interfície Qt"
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Convertidor de taxa de mostratge"
+msgstr "Convertidor de taxa de mostreig"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Sample Rate Converter Plugin for Audacious\n"
+"Connector de conversió de freqüència de mostreig per a Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Omet/repeteix les mostres"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2755,15 +2924,15 @@ msgstr "Interpolació lineal"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Interpolació ràpida de la sincronització"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Interpolació mitjana de la sincronització"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "La millor interpolació de la sincronització"
 
 #: src/resample/resample.cc:195
 msgid "<b>Conversion</b>"
@@ -2773,17 +2942,17 @@ msgstr "<b>Conversió</b>"
 msgid "Method:"
 msgstr "Mètode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Taxa:"
 
 #: src/resample/resample.cc:202
 msgid "<b>Rate Mappings</b>"
-msgstr ""
+msgstr "<b>Assignacions de les taxes</b>"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Usa sobre-mostratge"
+msgstr "Utilitza les assignacions de les taxes"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2825,52 +2994,41 @@ msgstr "176,4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "D'acord. Scrobbling per l'usuari: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "S'està comprovant l'accés a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permís denegat"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Hi ha un problema de xarxa."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "S'està comprovant..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_omprova permís"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Comprova el permís"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revoca permís"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Revoca el permís"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2894,88 +3052,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Sortida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"SDL Output Plugin for Audacious\n"
+"Connector de sortida SDL per a Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d resultat"
+msgstr[1] "%d resultats"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%d ocult)"
+msgstr[1] "(%d ocults)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d cançó"
+msgstr[1] "%d cançons"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
-msgstr ""
+msgstr "d'aquest gènere"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
-msgstr ""
+msgstr "per"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
-msgstr "_Crear llista de reproducció"
+msgstr "_Crea una llista de reproducció"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
-msgstr "_Afegir a la llista de reproducció"
+msgstr "_Afegeix a la llista de reproducció"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
-msgstr "Cercar biblioteca"
+msgstr "Cerca la biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Per importar la vostra col·lecció musical en l’Audacious, trieu una carpeta "
-"i feu clic a la icona «Actualitza»."
+"Per importar la vostra biblioteca de música a Audacious, trieu una carpeta i "
+"feu clic a la icona «refresca»."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Esperi si us plau..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Seleccioneu un directori"
 
@@ -2985,7 +3143,7 @@ msgstr "Reproductor SID"
 
 #: src/sid/xs_config.cc:61
 msgid "<b>Output</b>"
-msgstr ""
+msgstr "<b>Sortida</b>"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
@@ -2997,11 +3155,11 @@ msgstr "<b>Emulació</b>"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emula MOS 8580 (per defecte: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "No seleccionis automàticament el model del xip!"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -3021,7 +3179,7 @@ msgstr "<b>Temps de reproducció</b>"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Estableix el temps màxim de reproducció:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
@@ -3029,15 +3187,15 @@ msgstr ""
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Estableix el temps mínim de reproducció:"
 
 #: src/sid/xs_config.cc:96
 msgid "<b>Subtunes</b>"
-msgstr ""
+msgstr "<b>Subtons</b>"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr "Activa subtons"
+msgstr "Habilita els subtons"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
@@ -3049,14 +3207,14 @@ msgstr "<b>Nota</b>"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr "Eliminació de silenci"
+msgstr "Eliminació del silenci"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Silence Removal Plugin per l'Audacious\n"
+"Connector de supressió del silenci per a Audacious\n"
 "Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
@@ -3071,15 +3229,15 @@ msgstr "Llindar:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -3129,434 +3287,443 @@ msgstr "16 kHz"
 
 #: src/skins/equalizer.cc:271 src/skins-qt/equalizer.cc:267
 msgid "Audacious Equalizer"
-msgstr "Equalitzador de l'Audacious"
+msgstr "Equalitzador d'Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Anar a la posició %d:%-2.2d / %d:%-2.2d"
+msgstr "Vés a la posició %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volum: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanç: %d%% esquerra"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balanç: centrat"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanç: %d%% dreta"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menú d'opcions"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
-msgstr "Desactiva 'Sempre per sobre'"
+msgstr "Inhabilita 'Sempre per sobre'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
-msgstr "Activa 'Sempre per sobre'"
+msgstr "Habilita 'Sempre per sobre'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
-msgstr "Informació del fitxer"
+msgstr "Quadre d'informació del fitxer"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
-msgstr "Dobla mida"
+msgstr "Mida doble"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualitzacions"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
-msgstr ""
+msgstr "Apuja el volum"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
-msgstr ""
+msgstr "Abaixa el volum"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
-msgstr "Efectes ..."
+msgstr "Efectes..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
-msgstr ""
+msgstr "Enregistra el flux"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
-msgstr ""
+msgstr "Ajusts de l'àudio..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
-msgstr "Obre arxius ..."
+msgstr "Obre fitxers..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
-msgstr "Obre URL ..."
+msgstr "Obre l'URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
-msgstr "Cerca biblioteca"
+msgstr "Cerca la biblioteca"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reproducció"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
-msgstr "Llistes"
+msgstr "Llista de reproducció"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Sortida"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Finestres"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Serveis"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
-msgstr "Quant a ..."
+msgstr "Quant a..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
-msgstr "Opcions ..."
+msgstr "Ajusts..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Surt"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
-msgstr "Informació de la cançó ..."
+msgstr "Informació de la cançó..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
-msgstr ""
+msgstr "Ordre aleatori per àlbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
-msgstr "Discontinua la reproducció programada"
+msgstr "Sense l'avanç de la llista de reproducció"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
-msgstr ""
+msgstr "Atura després d'aquesta cançó"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Estableix la repetició A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Neteja la repetició A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Salta a la cançó..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Salta a l'instant..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
-msgstr ""
+msgstr "Reprodueix/reprèn"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Llista de reproducció nova"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Reanomena la llista de reproducció..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
-msgstr "Suprimeix llista de reproducció"
+msgstr "Suprimeix la llista de reproducció"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Llista de reproducció anterior"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
-msgstr ""
+msgstr "Llista de reproducció següent"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Importa la llista de reproducció..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Exporta la llista de reproducció..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Gestor de llistes de reproducció..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Gestor de la cua..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Refresca la llista de reproducció"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
-msgstr "Mostra l'editor de llistes"
+msgstr "Mostra l'editor la llista de reproducció"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostra l'equalitzador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Mostra el temps restant"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sempre per sobre"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
-msgstr ""
+msgstr "En tots els espais de treball"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Enrotlla cap a dalt el reproductor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Enrotlla cap a dalt l'editor de la llista de reproducció"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Enrotlla cap a dalt l'equalitzador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
-msgstr ""
+msgstr "Afegeix l'URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
-msgstr ""
+msgstr "Afegeix els fitxers..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Per títol"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
-msgstr ""
+msgstr "Per nom de fitxer"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
-msgstr ""
+msgstr "Per camí al fitxer"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Treu tots els elements"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Neteja la cua"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Treu els fitxers no disponibles"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Treu els duplicats"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Treu els no seleccionats"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Treu els seleccionats"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Cerca i selecciona"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverteix la selecció"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Selecciona no res"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Selecciona tots els elements"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
-msgstr "Pel número de pista"
+msgstr "Per número de pista"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
-msgstr "Per l'artista"
+msgstr "Per artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Per àlbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
-msgstr ""
+msgstr "Per artista de l'àlbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
-msgstr ""
+msgstr "Per data de llançament"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
-msgstr ""
+msgstr "Per gènere"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
-msgstr ""
+msgstr "Per longitud"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
-msgstr ""
+msgstr "Per títol personalitzat"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Barreja la llista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Inverteix la llista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordena els seleccionats"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordena la llista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Obre la carpeta contenidora"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
-msgstr "Retallar"
+msgstr "Retalla"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
-msgstr "Copiar"
+msgstr "Copia"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
-msgstr "Enganxar"
+msgstr "Enganxa"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Enganxa a l'acabament"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
-msgstr ""
+msgstr "Afegeix/treu de la cua"
 
 #: src/skins/playlist.cc:492 src/skins-qt/playlist.cc:477
 msgid "Audacious Playlist Editor"
-msgstr "Editor de llistes de l'Audacious"
+msgstr "Editor de la llista de reproducció d'Audacious"
 
 #: src/skins/playlist-widget.cc:55 src/skins-qt/playlist-widget.cc:52
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
-msgstr "Interfície del Winamp clàssic"
+msgstr "Interfície de Winamp clàssic"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
-msgstr ""
+msgstr "Obre la carpeta..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
-msgstr ""
+msgstr "Afegeix la carpeta..."
 
 #: src/skins-qt/skins_cfg.cc:197 src/skins/skins_cfg.cc:181
 msgid "Player:"
-msgstr ""
+msgstr "Reproductor:"
 
 #: src/skins-qt/skins_cfg.cc:199 src/skins/skins_cfg.cc:183
 msgid "Select main player window font:"
-msgstr "Trieu la fosa de la finestra principal:"
+msgstr ""
+"Seleccioneu el tipus de lletra de la finestra principal del reproductor:"
 
 #: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Playlist:"
-msgstr ""
+msgstr "Llista de reproducció:"
 
 #: src/skins-qt/skins_cfg.cc:202 src/skins/skins_cfg.cc:186
 msgid "Select playlist font:"
-msgstr "Trieu la fosa de la llista de reproducció:"
+msgstr "Seleccioneu el tipus de lletra de la llista de reproducció:"
 
 #: src/skins-qt/skins_cfg.cc:206 src/skins/skins_cfg.cc:190
 msgid "<b>Skin</b>"
-msgstr ""
+msgstr "<b>Tema</b>"
 
 #: src/skins-qt/skins_cfg.cc:210 src/skins/skins_cfg.cc:192
 msgid "<b>Fonts</b>"
-msgstr ""
+msgstr "<b>Tipus de lletres</b>"
 
 #: src/skins-qt/skins_cfg.cc:212 src/skins/skins_cfg.cc:194
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Utilitzar tipografies de mapa de bits (nomes suporta ASCII)"
+msgstr "Utilitza els tipus de lletra bitmap (només és compatible amb ASCII)"
 
 #: src/skins-qt/skins_cfg.cc:214 src/skins/skins_cfg.cc:196
 msgid "Scroll song title"
-msgstr ""
+msgstr "Desplaça el títol de la cançó"
 
 #: src/skins-qt/skins_cfg.cc:216 src/skins/skins_cfg.cc:198
 msgid "Scroll song title in both directions"
-msgstr "Desplaçar el títol de la cançó en ambdues direccions "
+msgstr "Desplaça el títol de la cançó en ambdues direccions"
 
 #: src/skins-qt/skins_cfg.cc:221 src/skins/skins_cfg.cc:203
 msgid "Analyzer"
@@ -3587,7 +3754,7 @@ msgstr "Foc"
 
 #: src/skins-qt/skins_cfg.cc:230 src/skins/skins_cfg.cc:212
 msgid "Vertical lines"
-msgstr ""
+msgstr "Línies verticals"
 
 #: src/skins-qt/skins_cfg.cc:234 src/skins/skins_cfg.cc:216
 msgid "Lines"
@@ -3606,9 +3773,9 @@ msgid "Slow"
 msgstr "Lent"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
-msgstr "Mitjà"
+msgstr "Mitja"
 
 #: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Fast"
@@ -3620,7 +3787,7 @@ msgstr "Al màxim"
 
 #: src/skins-qt/skins_cfg.cc:247 src/skins/skins_cfg.cc:229
 msgid "Dots"
-msgstr ""
+msgstr "Punts"
 
 #: src/skins-qt/skins_cfg.cc:248 src/skins/skins_cfg.cc:230
 msgid "Line"
@@ -3628,7 +3795,7 @@ msgstr "Línia"
 
 #: src/skins-qt/skins_cfg.cc:249 src/skins/skins_cfg.cc:231
 msgid "Solid"
-msgstr ""
+msgstr "Sòlid"
 
 #: src/skins-qt/skins_cfg.cc:255 src/skins/skins_cfg.cc:237
 msgid "Ice"
@@ -3644,7 +3811,7 @@ msgstr ""
 
 #: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Style:"
-msgstr ""
+msgstr "Estil:"
 
 #: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Falloff:"
@@ -3668,15 +3835,15 @@ msgstr ""
 
 #: src/skins-qt/skins_cfg.cc:291 src/skins/skins_cfg.cc:273
 msgid "<b>Type</b>"
-msgstr ""
+msgstr "<b>Tipus</b>"
 
 #: src/skins-qt/skins_cfg.cc:292 src/skins/skins_cfg.cc:274
 msgid "Visualization type:"
-msgstr ""
+msgstr "Tipus de visualització:"
 
 #: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
 msgid "<b>Analyzer</b>"
-msgstr ""
+msgstr "<b>Analitzador</b>"
 
 #: src/skins-qt/skins_cfg.cc:296 src/skins/skins_cfg.cc:278
 msgid "Show peaks"
@@ -3688,15 +3855,15 @@ msgstr "Visualització"
 
 #: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Decoració del Winamp 2.x arxivada"
+msgstr "Tema de Winamp 2.x arxivat"
 
 #: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Decoració del Winamp 2.x no arxivada"
+msgstr "Tema de Winamp 2.x no arxivat"
 
 #: src/skins/search-select.cc:75
 msgid "Search entries in active playlist"
-msgstr "Cerca elements en la llista de reproducció activa"
+msgstr "Cerca les entrades a la llista de reproducció activa"
 
 #: src/skins/search-select.cc:81
 msgid ""
@@ -3712,19 +3879,19 @@ msgstr ""
 
 #: src/skins/search-select.cc:89
 msgid "Title:"
-msgstr ""
+msgstr "Títol: "
 
 #: src/skins/search-select.cc:95
 msgid "Album:"
-msgstr ""
+msgstr "Àlbum:"
 
 #: src/skins/search-select.cc:101
 msgid "Artist:"
-msgstr ""
+msgstr "Artista: "
 
 #: src/skins/search-select.cc:107
 msgid "File Name:"
-msgstr ""
+msgstr "Nom del fitxer:"
 
 #: src/skins/search-select.cc:115
 msgid "Clear previous selection before searching"
@@ -3740,9 +3907,9 @@ msgstr "Crea una llista de reproducció nova amb els elements trobats"
 
 #: src/sndfile/plugin.cc:39
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Connector Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3764,66 +3931,67 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sortida Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Dispositiu (en blanc per al predeterminat):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Desa i restaura el volum:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Error de Sndio: Format de àudio no compatible (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Canvi de cançó"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
-msgstr ""
+msgstr "<b>Ordres</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
-msgstr ""
+msgstr "Ordre a executar quan es comença una cançó nova:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Ordre a executar a l'acabament d'una cançó:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Ordre a executar a l'acabament d'una llista de reproducció:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
+"Ordre a executar quan canvia el nom de la cançó (per als fluxos de xarxa):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3838,21 +4006,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
-msgstr ""
+msgstr "Informació de la cançó"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3861,45 +4029,45 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Ràpida"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Molt alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualitat:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
-msgstr "Icona d’estat"
+msgstr "Icona d'estat"
 
 #: src/statusicon-qt/statusicon.cc:65
 msgid ""
@@ -3915,19 +4083,19 @@ msgstr ""
 
 #: src/statusicon-qt/statusicon.cc:78 src/statusicon/statusicon.cc:387
 msgid "Close to the system tray"
-msgstr "Tanca a la safata del sistema"
+msgstr "A prop de la safata del sistema"
 
 #: src/statusicon-qt/statusicon.cc:85
 msgid "_Hide"
-msgstr ""
+msgstr "_Oculta"
 
 #: src/statusicon-qt/statusicon.cc:86
 msgid "_Restore"
-msgstr ""
+msgstr "_Restaura"
 
 #: src/statusicon-qt/statusicon.cc:95 src/statusicon/statusicon.cc:284
 msgid "Se_ttings ..."
-msgstr ""
+msgstr "Ajus_ts..."
 
 #: src/statusicon/statusicon.cc:370
 msgid ""
@@ -3939,10 +4107,17 @@ msgid ""
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Connector d'icona d'estat\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Aquest connector proporciona una icona d'estat, ubicada\n"
+"a la safata de sistema del gestor de finestres."
 
 #: src/statusicon/statusicon.cc:377
 msgid "<b>Mouse Scroll Action</b>"
-msgstr ""
+msgstr "<b>Acció del desplaçament del ratolí</b>"
 
 #: src/statusicon/statusicon.cc:378
 msgid "Change volume"
@@ -3954,11 +4129,11 @@ msgstr "Canvia la cançó"
 
 #: src/statusicon/statusicon.cc:384
 msgid "<b>Other Settings</b>"
-msgstr ""
+msgstr "<b>Altres ajusts</b>"
 
 #: src/statusicon/statusicon.cc:385
 msgid "Disable the popup window"
-msgstr "Desactiva la finestra emergent"
+msgstr "Inhabilita la finestra emergent"
 
 #: src/statusicon/statusicon.cc:389
 msgid "Advance in playlist when scrolling upward"
@@ -3966,7 +4141,7 @@ msgstr ""
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr ""
+msgstr "Estèreo extra"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -3974,21 +4149,24 @@ msgid ""
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Connector d'estèreo extra\n"
+"\n"
+"Per Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "<b>Extra Stereo</b>"
-msgstr ""
+msgstr "<b>Estèreo extra</b>"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Generador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tons:"
 
@@ -4000,12 +4178,18 @@ msgid ""
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
+"Generador de tons sinusoïdals per Haavard Kvaalen <havardk@xmms.org>\n"
+"Modificat per Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Per a utilitzar-ho, afegiu un URL: tone://feqüència1;feqüència2;"
+"feqüència3;...\n"
+"p. ex. tone://2000;2005 per a reproduir un to de 2000 Hz i un to de 2005 Hz."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Eliminació de la veu"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4025,15 +4209,32 @@ msgid ""
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Descodificador Ogg Vorbis d'Audacious\n"
+"\n"
+"Està basat en el connector Ogg Vorbis de la Fundació Xiph.org:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Codi original per:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contribucions de:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "Descodificador Ogg Vorbis"
 
 #: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Detalls quant a %s"
 
 #: src/vtx/info.cc:26
 msgid ""
@@ -4052,64 +4253,65 @@ msgstr ""
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr ""
+msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Reproductor del format de fitxer Vortex per Sashnov Alexander <sashnov@ngs."
+"ru>\n"
+"Està basat en in_vtx.dll per Roman Sherbakov <v_soft@microfor.ru>\n"
+"Connector d'Audacious per Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Connector Win32 waveOut per a Audacious\n"
+"Copyright 2016 John Lindgren"
 
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
-msgstr ""
+msgstr "Descodificador Wavpack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "amb pèrdues (híbrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "amb pèrdues"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Part del codi del connector va ser feta per Miles Egan."
 
 #: src/xsf/plugin.cc:50
 msgid "2SF Decoder"
-msgstr ""
+msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
-msgstr ""
+msgstr "<b> Configuració  de XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
-msgstr ""
+msgstr "Ignora la longitud del fitxer"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "S'ha produït un error en el crossfading perquè les cançons tenen un "
-#~ "número de canals diferents.  Podeu utilitzar el Channel Mixer per "
-#~ "convertir les cançons al mateix número de canals."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "S'ha produït un error en el crossfading perquè les cançons tenen taxes de "
-#~ "mostra diferents.  Podeu utilitzar el Sample Rate per convertir les "
-#~ "cançons a la mateixa taxa de mostra."
+msgstr "XSPF (XML Shareable Playlists)"
diff --git a/po/cmn.po b/po/cmn.po
index 257fc8a..9dd16a8 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -7,10 +7,10 @@
 # 趙惟倫 <bluebat@member.fsf.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Chinese (Mandarin) (http://www.transifex.com/jlindgren/"
 "audacious/language/cmn/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -28,20 +28,20 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "編曲機"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "鬧鐘"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "原本是由 Adam Feakin 與 Daniel Stodden 編寫。"
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -102,147 +102,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "這是您的喚醒。"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "您今天的提醒"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "提醒"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "星期一"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "星期五"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "時間"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "鈴響於 (預設)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "多久後靜音："
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "小時"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "分鐘"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "選擇想要在哪幾天啟用鬧鐘"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "哪幾天"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "預設"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "週排程"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "淡出"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "初始音量"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "最終音量"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "目前音量"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "額外命令"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "啟用"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "播放列表 (選用)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "請選擇播放列表"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "選項"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "這些選項代表什麼意思？"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "說明"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "專輯封面"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 輸出"
 
@@ -284,11 +284,11 @@ msgstr "混音器裝置："
 msgid "Mixer element:"
 msgstr "混音器元件："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -311,68 +311,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -380,86 +380,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 選擇 SoundFont 檔案"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "大小 (位元組)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "名稱："
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI 資訊 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "長度 (毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "音軌編號："
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "變動的"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM："
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg)："
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "時間分割："
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI 備註與歌詞 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含備註資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含歌詞資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (無效的 UTF-8 字串)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -471,7 +485,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Audacious OSD)"
 
@@ -523,94 +537,94 @@ msgstr "解除暫停"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "當解除暫停時觸發 OSD"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "放置位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "最大 OSD 寬度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "多螢幕選項"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "顯示 OSD："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "所有螢幕"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "螢幕 %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "計時 (毫秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "顯示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "字型"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "字型 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "陰影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "呈現樣式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "顏色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "顏色 %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "啟用觸發器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "已偵測到合成特效管理程式"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -619,60 +633,56 @@ msgstr ""
 "未偵測到合成特效管理程式；\n"
 "除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "假的透明特效不需要 Composite manager"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "假的透明特效"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真的透明特效 (需要 X Composite 延伸功能)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite 延伸功能未載入"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite 延伸功能不存在"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "動畫"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "裝飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "觸發"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "雜項"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -688,11 +698,11 @@ msgstr "ASXv1／ASXv2 播放列表"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放列表 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>色彩</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "模糊波形"
 
@@ -716,15 +726,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "截斷頻率："
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "頻譜分析儀"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "音樂 CD 外掛程式"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -744,118 +754,118 @@ msgstr ""
 "\n"
 "這是 Google Summer of Code 2007 專案之一。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>裝置</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "讀取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "覆載裝置："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>詮釋資料</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "使用 CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用 HTTP 而非 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "路徑："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "通訊埠："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "無法初始化 cdio 子系統。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "無效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "找不到音軌 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "軌道 %d 是資料軌。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "讀取音樂 CD 時發生錯誤。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "無法開啟 CD 裝置 %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "找不到可以播放音訊的光碟機。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "開啟的光碟機無法完成初始化。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "無法取得第一個或最後的音軌編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "無法讀取音軌 %d 的起始／結束邏輯磁區編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "無法建立 cddb 的連線。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "無法查詢 CDDB 伺服器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "無法查詢 CDDB 伺服器：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "無法讀取 cddb 資訊：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "光碟機是空的。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "未支援的光碟類型"
 
@@ -1014,58 +1024,60 @@ msgstr "效果強度："
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet 外掛程式"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "刪除"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1103,11 +1115,11 @@ msgstr "音量："
 msgid "Echo"
 msgstr "回音"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 外掛程式"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1123,15 +1135,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "檔案輸出外掛程式"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "選擇一個資料夾"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1148,194 +1156,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "輸出檔案格式："
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "儲存到原始資料夾"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "一般"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "聯合立體聲"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "演算法品質："
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "位元率 (kbps)："
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "壓縮比率："
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "音訊模式："
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "品質"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "啟用 VBR／ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "類型："
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR 選項："
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "最小位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "最大位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "強制使用最小位元率"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR 選項："
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "平均位元率 (kbps)："
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR 品質等級："
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "強制使用最小位元率"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR／ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "標示為著作權"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "標示為原創"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "強制加入第二版標籤"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "只加入第一版標籤"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "只加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "品質"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR／ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "品質等級 (0 - 10)："
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "一般"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC 解碼器"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "無損"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1347,7 +1439,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1355,19 +1447,19 @@ msgstr ""
 "Audacious 的 GIO 外掛程式\n"
 "著作權 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO 外掛程式"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1379,23 +1471,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 頻譜分析儀"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1412,8 +1491,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "項目編號"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "標題"
@@ -1470,8 +1549,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "搜尋工具"
 
@@ -1499,335 +1578,338 @@ msgstr "解除嵌入"
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O)…"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "開啟網址(_U)…"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "加入檔案(_A)… "
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "加入網址(_R)…"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "關於(_B)…"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "上一首(_V)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "重複"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "隨機"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "不要切換播放列表"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "播放完目前歌曲後停止(_F)"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I)…"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "跳至時間(_T)…"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "跳至歌曲(_J)…"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "設定重複點 _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "設定重複點 _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "清除重複點(_C)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "檔案路徑(_P)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "音軌編號(_N)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "演出者(_A)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "專輯(_B)"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "釋出日期(_D)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "長度(_L)"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "排序所選(_L)"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "移除重複的項目(_D)"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "移除不存在的檔案(_U)"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "重新命名(_A)…"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "匯入(_I)…"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "匯出(_E)…"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "播放列表管理(_M)…"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q)…"
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "顯示資訊列的視覺特效(_U)"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "顯示剩餘時間(_R)"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "播放列表(_L)"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "排入／移出佇列(_Q)"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "拷貝(_C)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "重新命名(_R)…"
 
@@ -1868,57 +1950,56 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK 介面"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "緩衝中…"
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "單聲道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "立體聲"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d 聲道"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "單一模式。"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "播放列表模式。"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "播放完成後停止。"
 
@@ -1926,9 +2007,9 @@ msgstr "播放完成後停止。"
 msgid "Previous track"
 msgstr "上一個音軌"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "播放"
 
@@ -1936,8 +2017,8 @@ msgstr "播放"
 msgid "Pause/Resume"
 msgstr "暫停／回復"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "停止"
 
@@ -2036,7 +2117,7 @@ msgstr "<b>按鍵綁定：</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "全域熱鍵"
 
@@ -2066,35 +2147,35 @@ msgstr ""
 " Jonathan A.Davis <davis@jdhouse.org>，\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK 輸出"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2194,48 +2275,48 @@ msgstr "重新連線至 LIRC 伺服器"
 msgid "Wait before reconnecting:"
 msgstr "重新連線前的等待時間："
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki 歌詞外掛程式"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "無可用的歌詞"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "錯誤"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "無法取得 %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "無法分析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "尋找歌詞中…"
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "找不到歌曲詮釋資料"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "連線至 lyrics.wikia.com 中…"
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2247,17 +2328,17 @@ msgstr "M3U 播放列表"
 msgid "Tact Generator"
 msgstr "節拍產生器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "節拍產生器：%d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "節拍產生器：%d bpm %d／%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2412,15 +2493,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 外掛程式"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "環繞"
 
@@ -2432,35 +2513,35 @@ msgstr "MPRIS 2 伺服器"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP／HTTPS 外掛程式"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious 非播放中。"
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面通知"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2493,15 +2574,15 @@ msgstr ""
 "您應該已經收到隨附於這個程式的 GNU 通用公共授權拷貝。 如果沒有，請參看 "
 "<http://www.gnu.org/licenses/>。"
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "顯示播放控制元件"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "永遠顯示通知"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2509,21 +2590,21 @@ msgstr ""
 msgid "Show"
 msgstr "顯示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "暫停"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "下一個"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 輸出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2565,23 +2646,23 @@ msgstr ""
 "我想要謝謝 #audacious 上的人們，特別是 Tony Vroon 與 John Lindgren，當然還有"
 "前一個 OSS 外掛程式的作者。"
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2593,51 +2674,34 @@ msgstr "PLS 播放列表"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1／PSF2 解碼器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio 輸出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio 輸出外掛程式\n"
-"\n"
-"這個程式是自由軟體；您可以遵循由自由軟體基金會\n"
-"所發布的 GNU 通用公共授權條款來再次散布與/或修改\n"
-"它；無論您依據的是本授權的第二版，或\n"
-"(您自行選擇的) 任何後續的版本。\n"
-"\n"
-"發行本程式是希望它能夠有用，\n"
-"但是沒有任何擔保；亦無對於某一特定目的之\n"
-"適售性與適用性的暗示性擔保。請參看\n"
-"GNU 通用公共授權以獲得更多細節。\n"
-"\n"
-"您應該已經收到隨附於這個程式的\n"
-"GNU 通用公共授權拷貝；如果沒有則請寫信到\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2646,47 +2710,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "上一個"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "重複"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "隨機"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2730,7 +2811,7 @@ msgstr "<b>轉換</b>"
 msgid "Method:"
 msgstr "演算法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "取樣率："
 
@@ -2782,55 +2863,42 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz："
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "確認。上傳使用者 %s 的播放資訊"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "存取被拒"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "點選下列鏈結允許 Audacious 上傳您的播放資訊："
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "請保持這個視窗的開啟並再次點選「檢查權限」。\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"別擔心。您的資訊已經儲存在電腦上。\n"
-"Audacious 會在狀況允許下盡快地將它們上傳。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "網路發生問題。"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "存取 Last.fm 時發生問題。請稍候再試。"
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "檢查中…"
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "檢查權限(_H)"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "撤銷授權(_R)"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "您需要允許 Audacious 上傳音軌的播放資訊至您的 Last.fm 帳號。\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2861,7 +2929,7 @@ msgstr ""
 "感謝 John Lindgren 在這個專案的開頭助我一臂之力。\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2869,11 +2937,11 @@ msgstr ""
 "Audacious 現在使用改良版的 Last.fm 播放資訊上傳功能。\n"
 "請參閱偏好設定中的播放資訊外掛。"
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 輸出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2881,66 +2949,66 @@ msgstr ""
 "Audacious 的 SDL 輸出外掛程式\n"
 "著作權 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "媒體櫃"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "建立播放列表(_C)"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "加入至播放列表(_A)"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "搜尋媒體櫃"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "要將您的媒體櫃匯入至 Audacious，請選擇目標資料夾並且按下「重新整理」圖示。"
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "請稍候…"
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "選擇資料夾"
 
@@ -3034,15 +3102,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "已清除重複點。"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "已設定重複點 A。"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "已設定重複點 B。"
 
@@ -3094,373 +3162,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious 等化器"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "移動至 %d:%-2.2d／%d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量：%d％"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡：%d％ 偏左"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "平衡：中間"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡：%d％ 偏右"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "選單選項"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "關閉置頂"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "啟用置頂"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "檔案資訊視窗"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "播放"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "播放列表"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "檢視"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "不要切換播放列表"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "新增播放列表"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "顯示播放列表編輯器"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "顯示等化器"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "永遠在最上層"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "標題"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "全部移除"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "清除佇列"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "移除無法使用的檔案"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "移除重複的項目"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "移除未選擇的項目"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "移除選擇的項目"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "搜尋並選擇"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "取消選擇"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "選擇全部"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "音軌編號"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "演出者"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "專輯"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "列表隨機排序"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "列表反向排序"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "排序選擇的項目"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "拷貝"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3473,15 +3549,15 @@ msgstr "Audacious 播放列表編輯器"
 msgid "%s (%d of %d)"
 msgstr "%s (%d／%d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp 傳統介面"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3569,7 +3645,7 @@ msgid "Slow"
 msgstr "慢"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "中等"
 
@@ -3703,7 +3779,7 @@ msgstr "以符合的項目建立新的播放列表"
 msgid "Sndfile Plugin"
 msgstr "Sndfile 外掛程式"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3741,66 +3817,66 @@ msgstr ""
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "歌曲切換"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3815,21 +3891,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重取樣"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3843,43 +3919,43 @@ msgstr ""
 "基於取樣率轉換器外掛程式：\n"
 "著作權 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "品質："
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "速度與音高"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>速度與音高</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "速度："
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "音高："
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "狀態圖示"
 
@@ -3974,12 +4050,12 @@ msgstr "<b>額外立體聲效果</b>"
 msgid "Tone Generator"
 msgstr "音調產生器"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音調產生器："
 
@@ -4001,7 +4077,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "人聲移除"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4067,7 +4143,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX 解碼器"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4077,19 +4153,29 @@ msgstr ""
 "基於 invtx(_V).dll 編寫自 Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious 外掛程式編寫自 Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack 解碼器"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "失真 (混合)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "失真"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4103,14 +4189,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF 解碼器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 可分享式播放列表 (XSPF)"
diff --git a/po/cs.po b/po/cs.po
index f5db929..57f91c6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,13 +14,14 @@
 # Petr Šimáček <petr.simacek@gmail.com>, 2012
 # Petr Šimáček <petr.simacek@gmail.com>, 2012
 # Petr Šimáček <petr.simacek@gmail.com>, 2013-2014
+# Roman Horník <roman.hornik@debian-linux.cz>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Roman Horník <roman.hornik@debian-linux.cz>\n"
 "Language-Team: Czech (http://www.transifex.com/jlindgren/audacious/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -29,7 +30,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) dekodér"
 
@@ -37,20 +38,20 @@ msgstr "AAC (Raw) dekodér"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib přehrávač)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "seřazen"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Budík"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
-msgstr "Nastavit budík"
+msgstr "Nastavit budík..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -60,7 +61,7 @@ msgstr ""
 "\n"
 "Původně napsal Adam Feakin a Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -110,148 +111,192 @@ msgid ""
 "    Type the reminder in the input field and enable\n"
 "    the checkbox if you want it to be shown."
 msgstr ""
+"Čas\n"
+"Budit v:\n"
+"Čas budíčku.\n"
+"\n"
+"Ticho po:\n"
+"Zastavit budík po uplynutí této doby.\n"
+"(pokud nebude budící dialog uzavřen)\n"
+"\n"
+"Dny\n"
+"Den:\n"
+"Vyberte dny, kdy má budík fungovat.\n"
+"\n"
+"Čas:\n"
+"Vyberte čas budíčku pro každý den,\n"
+"nebo použijte standardní čas.\n"
+"\n"
+"Hlasitost\n"
+"Zesilování:\n"
+"Zesiluje až na určenou úroveň po vybranou dobu.\n"
+"\n"
+"Začít na:\n"
+"Zesilovat začne na této hlasitosti.\n"
+"\n"
+"Skončit na:\n"
+"Hlasitost na konci zesílení.\n"
+"Je-li doba zesilování 0, pak hlasitost bude tato.\n"
+"\n"
+"Volby:\n"
+"Dodatečný příkaz:\n"
+"Tento příkaz bude vykonán v době budíčku.\n"
+"\n"
+"Seznam skladeb:\n"
+"Načte tento seznam skladeb, z kterého bude\n"
+"hrát - musí mít příponu m3u.\n"
+"Není-li seznam zadán budou použity skladby,\n"
+"které budou v aktuálním seznamu skladeb.\n"
+"URL MP3/OGG proudu zde také může být\n"
+"zadáno, ale načítání seznamu skladeb z URL\n"
+"není v současnosti podporováno.\n"
+"\n"
+"Upomínání:\n"
+"Při vypnutí budíku zobrazí vzkaz.\n"
+"Text vzkazu vepište do vstupního pole a\n"
+"zapněte přepínač, přejete-li si zobrazovat vzkaz."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Toto je váš budící signál."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Vaše připomínka pro dnešek je..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Upomínání"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Čas"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
-msgstr "Budit v (standardní):"
+msgstr "Budit v (výchozí):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Ticho po:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "h"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "min"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Vyberte dny, kdy má budík budit"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Den"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
-msgstr "Standardní"
+msgstr "Výchozí"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dny"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Zesilování"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekund"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Začít na"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Skončit na"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Současná"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Dodatečný příkaz"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "zapnout"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Seznam skladeb (volitelné)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Vybrat seznam skladeb"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Nastavení"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Co tyto volby znamenají?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
-msgstr "Album"
+msgstr "Obal alba"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA výstup:"
 
@@ -271,15 +316,15 @@ msgstr ""
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(bez popisu)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
-msgstr "Implicitní PCM zařízení"
+msgstr "Výchozí PCM zařízení"
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr "Implicitní směšovací zařízení"
+msgstr "Výchozí směšovací zařízení"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
@@ -293,11 +338,11 @@ msgstr "Zařízení směšovače:"
 msgid "Mixer element:"
 msgstr "Prvek směšovače:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI přehrávač)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -319,69 +364,88 @@ msgid ""
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Olug\n"
+"modulární hudební přehrávač MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"napsal Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"zvláštní poděkování náleží:\n"
+"\n"
+"Clemens Ladisch a Jaroslav Kysela\n"
+"pro jejich skvostné programy aplaymidi a amixer; tyto\n"
+"byly vskutku užitečné, společně s dokumentací pro alsa-lib,\n"
+"díky nimž jsem se dozvěděl více o ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"za krásné logo MIDI klávesnice\n"
+"\n"
+"Tony Vroon\n"
+"za hodnotnou pomoc při alfatestování"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Potlačit výchozí zesílení:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Potlačit výchozí vícehlas:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Potlačit výchozí dozvuk:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Potlačit výchozí sbor:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
-msgstr "<b>Playback</b>"
+msgstr "<b>Přehrávání</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponovat: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "půltóny"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Posun bubnu: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "čísla poznámek"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Přeskočit ticho na začátku"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Přeskočit ticho na konci"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Vzorkovací frekvence:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -389,86 +453,106 @@ msgstr "Vzorkovací frekvence:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug – vyberte soundfontový soubor"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Velikost (v bajtech):"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"small\"> Podrobnosti o MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Délka (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
-msgstr "č. skladby"
+msgstr "Počet stop:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "proměnlivé"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Čas. pom.:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"small\"> Komentáře a text MIDI skladby </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází žádné komentáře *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází text skladby *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (neplatné UTF8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache Browser\n"
+"\n"
+"Klient Ampache pro Audacious.\n"
+"\n"
+"Licence: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský a John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -479,8 +563,15 @@ msgid ""
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Napsal Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Částečně založeno na knihovně Ghosd Evana Martina:\n"
+"http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -514,7 +605,7 @@ msgstr "Změna názvu"
 
 #: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Spustí OSD při změně názvu skladby (pro internetové proudy)."
 
 #: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
@@ -532,94 +623,94 @@ msgstr "Obnovení přehrávání"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Spustí OSD, když přehrávání obnoveno."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relativní odsazení ve směru osy X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relativní odsazení ve směru osy Y"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maximální šířka OSD"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Nastavení pro více monitorů"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Zobrazit OSD na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "všech monitorech"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitoru %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Časování (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Zobrazení:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Rozsvícení:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Pohasnutí:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Fonty"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Stín"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Styl vyobrazení"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Barvy %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Povolit spouštěč"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Událost"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Nalezen kompozitní správce"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -629,60 +720,56 @@ msgstr ""
 "Pokud nevíte, že byste jste již nějakého spustili, prosím, aktivujte "
 "kompozitního správce, jinak OSD nebude správně fungovat."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Při falešné průhlednosti není kompozitní správce potřeba"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Průhlednost"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Falešná průhlednost"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutečná průhlednost (vyžaduje kompozitní rozšíření X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Kompozitní rozšíření není nahráno"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozitní rozšíření není dostupné"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>OSD Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animace"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Různé"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Zkouška"
 
@@ -698,11 +785,11 @@ msgstr "ASXv1/ASXv2 seznamy skladeb"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious seszam skladeb (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Barva</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Rozsah rozostření"
 
@@ -726,15 +813,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Ořezová frekvence:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analyzátor spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -754,118 +841,118 @@ msgstr ""
 "\n"
 "Toto byl projekt v rámci Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Zařízení</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Rychlost čtení:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Přepsat zařízení:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Použití CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Používat CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Použít HTTP místo CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Cesta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nepodařilo se inicializovat cdio subsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d nebyla nalezena."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Stopa %d je datová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Chyba při čtení zvukového CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nelze otevřít CD zařízení %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Nebyly nalezeny funkční CD mechaniky"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepodařilo se dokončit inicializaci otevření CD mechaniky."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Nepodařilo se načíst první/poslední číslo skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "nelze přečíst začátek/konec LSN pro skladbu %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Nepodařilo se vytvořit připojení k CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Nepodařil se dotaz na server CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodařil se dotaz na server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Nepodařilo se přečíst cddb info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Mechanika je prázdná"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný druh disku."
 
@@ -891,13 +978,15 @@ msgstr "Hlasitost středu:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr "Rozsah dynamiky:"
+msgstr "Dynamický rozsah:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Zásuvný modul komprese dynamického rozsahu pro Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -912,6 +1001,12 @@ msgid ""
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Dekodér hudby z herních konzolí, založen na Game_Music_Emu 0.5.2\n"
+"Podporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Zásuvný modul pro Audacious od:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -927,7 +1022,7 @@ msgstr "Ozvěna:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Implicitní délka skladby:"
+msgstr "Výchozí délka skladby:"
 
 #: src/console/plugin.cc:42 src/modplug/plugin_main.cc:62
 msgid "<b>Resampling</b>"
@@ -965,6 +1060,11 @@ msgid ""
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Výstupní zásuvný modul CoreAudio pro Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Založeno na výstupním zásuvném modulu SDL pro Audacious\n"
+"Copyright 2010 John Lindgren"
 
 #: src/coreaudio/coreaudio.cc:143
 msgid "Use exclusive mode"
@@ -975,7 +1075,7 @@ msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Crossfade výstupní modul for Audacious\n"
+"Zásuvný modul prolínání pro Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
 #: src/crossfade/crossfade.cc:47
@@ -992,7 +1092,7 @@ msgstr "Přesah:"
 
 #: src/crossfade/crossfade.cc:54
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "Při vyhledávání nebo při ruční změně skladby"
 
 #: src/crossfade/crossfade.cc:60
 msgid "<b>Tip</b>"
@@ -1003,6 +1103,8 @@ msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"Pro lepší prolínání povolte\n"
+"efekt odstanění ticha."
 
 #: src/crossfade/crossfade.cc:71
 msgid "Crossfade"
@@ -1020,58 +1122,60 @@ msgstr "Intenzita:"
 msgid "Crystalizer"
 msgstr "Krystalizér"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Zásuvný modul pro Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Smazat soubory"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
-msgstr ""
+msgstr "Chyba při přesunu %s do koše: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Chyba při mazání %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Chyba při mazání %s: není to lokální soubor."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Chcete přesunout vybrané soubory do koše?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Přesunout do koše"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Opravdu chcete trvale odstranit vybrané soubory?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Smazat vybrané soubory"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Metoda mazání<b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Presuň do koše místo okamžitého smazání"
 
@@ -1082,6 +1186,10 @@ msgid ""
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Zásuvný modul ozvěny\n"
+"Od: Johan Levin, 1999\n"
+"Prostorová ozvěna od: Carl van Schaik, 1999\n"
+"Aktualizovali pro Audacious: William Pitcock aJohn Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "<b>Echo</b>"
@@ -1109,11 +1217,11 @@ msgstr "Hlasitost:"
 msgid "Echo"
 msgstr "Ozvěna"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1129,15 +1237,11 @@ msgstr ""
 "Williama Pitcocka <nenolod@nenolod.net>\n"
 "Matti Hämäläinena <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Přídavný modul FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Vybrat složku"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1153,195 +1257,291 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Tento program je svobodný software: můžete jej šířit a/nebo upravovat dle "
+"podmínek GNU General Public License, vydávané Free Software Foundation, a to "
+"buď verze 2 této licence, nebo (dle vlastního uvážení) kterékoliv pozdější "
+"verze.\n"
+"\n"
+"Tento program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV ZÁRUKY; "
+"dokonce i bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO KONKRÉTNÍ "
+"ÚČEL. Podívejte se na GNU General Public License pro další podrobnosti.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License spolu s tímto programem; "
+"Pokud tomu tak není, napište si do Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formát výstupního souboru:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Ukládat do původního adresáře"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
-msgstr ""
+msgstr "Uložit do vlastní složky:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Generuj jméno souboru z:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Originální jméno souboru"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
-msgstr ""
+msgstr "Původní název souboru (bez přípony)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
-msgstr ""
+msgstr "Původní značka souboru"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Předřadit číslo stopy k jménu souboru"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Obecné"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8kb/s"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16kb/s"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32kb/s"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40kb/s"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48kb/s"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56kb/s"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64kb/s"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80kb/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96kb/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112kb/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128kb/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160kb/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192kb/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224kb/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256kb/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320kb/s"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint-stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Kvalita algoritmu:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Výstupní vzorkovací frekvence:"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Kompresní poměr:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Datový tok (kb/s):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Datový tok:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Kompresní poměr:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Zvukový režim:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Režim zvuku:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Různé:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Vynutit přísnou shodu s ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Ochrana před chybami"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvalita"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Povolit VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Druh:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Nastavení VBR:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Minimální datový tok:"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Nejmenší datový tok (kb/s):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Maximální datový tok:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Největší datový tok (kb/s):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Průměrný datový tok:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Přísně vynucovat nejmenší datový tok"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Nastavení ABR:"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Průměrný datový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Přísně vynucovat nejmenší datový tok"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Vynechat Xing VBR hlavičku"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parametry rámců:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Hlavičky rámců</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Označit jako podléhající autorskému právu"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Označit jako původní"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 Parametry:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 značky</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Vynutit přidání popisků verze 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Přidávat jen popisky verze 1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Přidávat jen popisky verze 2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvalita"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Popisky"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Úroveň kvality (0–10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Kvalita (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Obecné"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC Dekodér"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "Bezztrátová kvalita"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1353,7 +1553,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1361,19 +1561,19 @@ msgstr ""
 "GIO zásuvný modul pro Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Režim \"načíst a přidat\" není podporován"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Neplatný způsob otvírání"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1393,23 +1593,10 @@ msgstr ""
 "\n"
 "Licence: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL analyzátor spektra"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME Klávesové zkratky"
@@ -1430,8 +1617,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Název"
@@ -1488,8 +1675,8 @@ msgstr "Použitelné sloupce"
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Vyhledávací nástroj"
 
@@ -1517,337 +1704,340 @@ msgstr "Neumisťovat"
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Otevřít soubory…"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Otevřít _URL…"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Přid_at soubory…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Přidat U_RL…"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Prohledej knihovnu"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_O programu… "
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Nastavení ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Hrát"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "P_ozastavit"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Před_chozí"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Další"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Opakovat"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Ná_hodné přehrávání"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
-msgstr ""
+msgstr "Náh_odné přehrávání v rámci alba"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Žádné p_okračování dle seznamu skladeb"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Zastavit _po této skladbě"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informace o skladbě…"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Přejí_t na čas…"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Pře_jít na skladbu…"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Nastavit bod opakování _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Nastavit bod opakování _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Vymazat body opakování"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Podle ná_zvu"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
-msgstr ""
+msgstr "Podle ná_zvu souboru"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Podle cesty k _souboru"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Podle čísla _stopy"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Podle _umělce"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Podle Al_ba"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Podle u_mělce alba"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Podle data vy_dání"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
-msgstr ""
+msgstr "Podle žá_nru"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Podle _délky"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Podle _cesty k souboru"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "_Vlastní název"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Obrátit pořadí"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Přehrát/Pokračovat"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Obnovit"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Seřadit vy_brané"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Odstranit _duplikáty"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Odstranit nedost_upné soubory"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Přej_menovat"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Odstraň"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importovat…"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportovat…"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Organizace seznamů skladeb"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Správce _fronty…"
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Ze_sílit"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Z_tišit"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
-msgstr ""
+msgstr "_Ekvalizér..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fekty ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
-msgstr ""
+msgstr "Záznam p_roudu"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
-msgstr ""
+msgstr "Na_stavení zvuku..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Zobrazit h_lavní nabídku"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Zobrazit oblast i_nformací"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Zobrazit znázornění oblasti informací"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Zobrazit _stavový panel"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Ukázat _zbývající čas"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Vizualizace"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Seznam sk_ladeb"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "Při_dat/odebrat do/z fronty"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Otevřít složku"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "Obnovit vyb_rané"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "V_yjmout"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Vložit na kon_ec"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Vybr_at vše"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
-msgstr "_Přejmenovat ..."
+msgstr "_Přejmenovat..."
 
 #: src/gtkui/settings.cc:35 src/qtui/settings.cc:53
 msgid "<b>Playlist Tabs</b>"
@@ -1886,33 +2076,32 @@ msgstr "Klávesy šipek posouvají o:"
 msgid "Scroll on song change"
 msgstr "Posun při změně skladby"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Plnění vyrovnávácí paměti…"
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1920,25 +2109,25 @@ msgstr[0] "%d kanál"
 msgstr[1] "%d kanály"
 msgstr[2] "%d kanálů"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
-msgstr ""
+msgstr "%dkHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
@@ -1946,9 +2135,9 @@ msgstr "Zastavuje po skladbě."
 msgid "Previous track"
 msgstr "Předchozí skladba"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Hrát"
 
@@ -1956,8 +2145,8 @@ msgstr "Hrát"
 msgid "Pause/Resume"
 msgstr "Pozastavit/Pokračovat"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Zastavit"
 
@@ -2056,7 +2245,7 @@ msgstr "<b>Navázání kláves:</b>"
 msgid "_Add"
 msgstr "_Přidat"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globální klávesové zkratky"
 
@@ -2074,27 +2263,39 @@ msgid ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
-
-#: src/jack-ng/jack-ng.cc:50
+"Zásuvný modul globálních klávesových zkratek\n"
+"Ovládá přehrávač pomocí globálních kombinací kláves nebo pomocí "
+"multimediálních kláves.\n"
+"\n"
+"Copyright (c) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Přispěvatelé:\n"
+"Copyright (c) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (c) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Bryn Davies <curious@ihug.com.au>,\n"
+"Jonathan A. Davis <davis@jdhouse.org>,\n"
+"Jeremy Tan <nsx@nsx.homeip.net>"
+
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automaticky připojit k výstupním portům"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Pouze %d JACK výstupních portů bylo nalezeno, ale %d je jich vyžadováno."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Nepodařilo se připojit na JACK port %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2102,11 +2303,11 @@ msgstr ""
 "JACK podporuje pouze floating-point audio. Musíte změnit výstupní bitovou "
 "hloubku na Plovoucí desetinnou čárku v nastavení JACK výstupu."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Nepodařilo se spojit s JACK servrem; běží?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2210,50 +2411,50 @@ msgstr "Znovu se připojit k serveru LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Vyčkat před opětovným připojením:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki Plugin"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Žádný text k dispozici"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Chyba"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nelze načíst %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nelze analyzovat %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
-msgstr "Hledám texty ..."
+msgstr "Hledám text skladby..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Chybí metadata skladby"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Připojování k lyrics.wikia.com ..."
+msgstr "Připojování k lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
-msgstr ""
+msgstr "Upravit text skladby..."
 
 #: src/m3u/m3u.cc:32
 msgid "M3U Playlists"
@@ -2263,17 +2464,17 @@ msgstr "M3U Playlisty"
 msgid "Tact Generator"
 msgstr "Genetátor taktů"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d dob/min"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2353,23 +2554,23 @@ msgstr "Vícefázové (nejlepší)"
 
 #: src/modplug/plugin_main.cc:67
 msgid "<b>Sample rate</b>"
-msgstr "<b>Vzorkovací kmitočet</b>"
+msgstr "<b>Vzorkovací frekvence</b>"
 
 #: src/modplug/plugin_main.cc:68
 msgid "22 kHz"
-msgstr "22 kHz"
+msgstr "22.05kHz"
 
 #: src/modplug/plugin_main.cc:69
 msgid "44 kHz"
-msgstr "44 kHz"
+msgstr "44.1kHz"
 
 #: src/modplug/plugin_main.cc:70
 msgid "48 kHz"
-msgstr "48 kHz"
+msgstr "48kHz"
 
 #: src/modplug/plugin_main.cc:71
 msgid "96 kHz"
-msgstr "96 kHz"
+msgstr "96kHz"
 
 #: src/modplug/plugin_main.cc:75 src/modplug/plugin_main.cc:80
 #: src/modplug/plugin_main.cc:85
@@ -2428,15 +2629,15 @@ msgstr "Tyto nastavení se projeví až po restartu Audacious."
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Pokročilé</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Použij přesný výpočet délky (pomalé)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
@@ -2448,35 +2649,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Chyba zpracování přesměrování"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Neznámá HTTP chyba"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Chyba zpracování URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
-msgstr ""
+msgstr "Příliš přesměrování"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious nyní nehraje."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Oznámení na plochu"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2495,16 +2696,32 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Zásuvný modul upozornění pro Audacious\n"
+"Copyright (c) 2010 Maximilian Bogner\n"
+"Copyright (c) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Tento zásuvný modul je svobodný software: můžete jej šířit a/nebo upravovat "
+"dle podmínek GNU General Public License, vydávané Free Software Foundation, "
+"a to buď verze 3 této licence, nebo (dle vlastního uvážení) kterékoliv "
+"pozdější verze.\n"
+"\n"
+"Tento zásuvný modul je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV "
+"ZÁRUKY; dokonce i bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO "
+"KONKRÉTNÍ ÚČEL. Podívejte se na GNU General Public License pro další "
+"podrobnosti.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License spolu s tímto programem. "
+"Pokud tomu tak není, podívejte se na <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Ukázat ovládání přehrávání"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Vždy ukázat oznámení"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Včetně jména alba v oznámení"
 
@@ -2512,27 +2729,27 @@ msgstr "Včetně jména alba v oznámení"
 msgid "Show"
 msgstr "Ukázat"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Další"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 výstup"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr "Standardní zařízení"
+msgstr "Výchozí zařízení"
 
 #: src/oss4/plugin.cc:78
 msgid "Audio device:"
@@ -2568,23 +2785,23 @@ msgstr ""
 "Rád bych poděkoval lidem z #audacious, zejména Tonymu Vroonnovy a Johnu "
 "Lindgrennovy a samozřejmě také autorům předešlého OSS zásuvného modulu."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Správce seznamu skladeb"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Položky"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Přejmenovat"
 
@@ -2596,35 +2813,34 @@ msgstr "PLS seznamy skladeb"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekodér"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio Výstup"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Výstup QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2632,48 +2848,79 @@ msgid ""
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Výstupní zásuvný modul QtMultimedia pro Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Založeno na výstupním zásuvném modulu SDL pro Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Spektrální analyzér OpenGL pro Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren a Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Založeno na zásuvném modulu pro XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson a "
+"4Front Technologies\n"
+"\n"
+"Licence: GPLv2+"
 
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Pracuji ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informace"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Hledej"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Otevřít složku ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Přidat složku"
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Inspektor logů."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Otevřít soubory"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Přidat soubory"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Opakovat"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Náhodné přehrávání"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Otevřít složku ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Přidat složku"
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Inspektor logů."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt rozhraní"
 
@@ -2686,6 +2933,8 @@ msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Převodník vzorkovací frekvence pro Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2715,13 +2964,13 @@ msgstr "<b>Převod</b>"
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
-msgstr "Hodnocení:"
+msgstr "Frekvence:"
 
 #: src/resample/resample.cc:202
 msgid "<b>Rate Mappings</b>"
-msgstr ""
+msgstr "<b>Mapování vzorkovací frekvence</b>"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
@@ -2767,54 +3016,44 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Přístup odepřen"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Ponech toto okno otevřené a klikni znovu na  'Check Permission'.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Ověřuje se přístup k Last.fm..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problém se sítí."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Oprávnění uděleno. Scrobbluji pro uživatele %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Objevil se problém při kontaktování Last.fm. Zkuste to prosím za chvíli."
+"Oprávnění zapovězeno. Otevřete v prohlížeči následující URL, povolte přístup "
+"Audacious k vašemu účtu, poté znovu klikněte na 'Ověřit oprávnění':"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Prověřuje se..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Nastal problém s kontaktováním Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Z_kontrolovat oprávnění"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Ověřit oprávnění"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Odvolání oprávnění"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Odvolat oprávnění"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "Musíte povolit Audacious scrobblovat skladby do Last.fm účtu.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Musíte povolit Audacious scrobblovat skladby do Last.fm účtu."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2825,6 +3064,8 @@ msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Zásuvný modul scrobbleru nemohl být spuštěn.\n"
+"Může se jednat o problém ve vaší instalaci."
 
 #: src/scrobbler2/scrobbler.cc:289
 msgid ""
@@ -2836,18 +3077,24 @@ msgid ""
 "project.\n"
 "\n"
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 od Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Poděkování patří Johnu Lindgrenovi za pomocnou ruku v začátcích tohoto "
+"projektu.\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL Výstup"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2855,61 +3102,61 @@ msgstr ""
 "SDL výstupní zásuvný modul pro Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Knihovna"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d výsledek"
+msgstr[1] "%d výsledky"
+msgstr[2] "%d výsledků"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "(%d skrytý)"
+msgstr[1] "(%d skryté)"
+msgstr[2] "(%d skrytých)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d skladba"
+msgstr[1] "%d skladby"
+msgstr[2] "%d skladeb"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
-msgstr ""
+msgstr "tohoto žánru"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
-msgstr ""
+msgstr "na"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
-msgstr ""
+msgstr "od"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Vytvořit seznam skladeb"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Přid_at do seznamu skladeb"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Prohledat knihovnu"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2917,11 +3164,11 @@ msgstr ""
 "Hudební knihovnu se do Audacious naimportuje tak, že vyberete složku a pak "
 "kliknete na ikonu „obnovit“."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Prosím, počkejte…"
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Vybrat složku"
 
@@ -2947,7 +3194,7 @@ msgstr "Emuluj MOS 8580 (standardně: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Nevybírat automaticky model čipu"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -2955,11 +3202,11 @@ msgstr "Emuluj filtr"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Hodinová frekvence:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Nevybírat automaticky hodinovou frekvenci"
 
 #: src/sid/xs_config.cc:80
 msgid "<b>Playback time</b>"
@@ -2979,15 +3226,15 @@ msgstr "Nastavit nejkratší čas přehrávání:"
 
 #: src/sid/xs_config.cc:96
 msgid "<b>Subtunes</b>"
-msgstr ""
+msgstr "<b>Podskladby</b>"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Povolit podskladby"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorovat podskladby kratší jak:"
 
 #: src/sid/xs_config.cc:105
 msgid "<b>Note</b>"
@@ -3017,15 +3264,15 @@ msgstr "Práh:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "A-B opakování smazáno."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Nastavit bod opakování A."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Nastavit bod opakování B."
 
@@ -3077,373 +3324,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Přejít na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitost: %d %%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyvážení: %d %% vlevo"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Vyvážení: střed"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyvážení: %d %% vpravo"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Nabídka nastavení"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Vypnout „Vždy na vrchu“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Zapnout „Vždy na vrchu“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Informace o souboru"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dvojitá velikost"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Vizualizace."
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
-msgstr ""
+msgstr "Záznam zapnut"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
-msgstr ""
+msgstr "Záznam vypnut"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
-msgstr ""
+msgstr "Zvýšit hlasitost"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
-msgstr ""
+msgstr "Snížit hlasitost"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
-msgstr ""
+msgstr "Efekty..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
-msgstr ""
+msgstr "Záznam proudu"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
-msgstr ""
+msgstr "Nastavení zvuku..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Otevři soubory ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Otevři URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Prohledej knihovnu"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
-msgstr ""
+msgstr "Výstup"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Zobrazení"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Služby"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "O programu ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Nastavení ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Informace o skladbě ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
-msgstr ""
+msgstr "Náhodně v rámci alba"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Žádné pokračování dle seznamu skladeb"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Zastavit po této skladbě"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Nastavit A-B opakování"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Smazat A-B opakování"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Přejít na skladbu ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Přejít na čas ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
-msgstr ""
+msgstr "Přehrát/Pokračovat"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nový seznam skladeb"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Přejmenuj seznam skladeb"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Odstraň seznam skladeb"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Předchozí seznam skladeb"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Další seznam skladeb"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importuj seznam skladeb ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportuj seznam skladeb ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Správce seznamu skladeb ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Správce fronty ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Obnov seznam skladeb"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Ukázat ekvalizér"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Ukaž zbývající čas"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Vždy na vrchu"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Na všech pracovních plochách"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Vybalit přehrávač"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Vybalit editor seznamu skladeb"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Vybalit ekvalizér"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Přidej URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Přidej soubory ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Podle názvu"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
-msgstr ""
+msgstr "Podle názvu souboru"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
-msgstr ""
+msgstr "Podle cesty k souboru"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Odebrat všechny"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Vyprázdnit frontu"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Odstranit nedostupné soubory"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Odebrat duplikáty"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Odebrat neoznačené"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Hledání a výběr"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Nevybrat žádné"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Podle čísla stopy"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Podle umělce"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Podle alba"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
-msgstr ""
+msgstr "Podle umělce alba"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
-msgstr ""
+msgstr "Podle data vydání"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
-msgstr ""
+msgstr "Podle žánru"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
-msgstr ""
+msgstr "Podle délky"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
-msgstr ""
+msgstr "Podle vlastního názvu"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Zamíchat pořadí"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Otočit seznam"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Seřadit vybrané"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Seřadit seznam"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Oříznout"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Vložit na konec"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Přidat/odebrat do/z fronty"
 
@@ -3456,17 +3711,17 @@ msgstr "Zobrazit editor seznamu skladeb"
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Rozhraní Winamp Classic "
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
-msgstr ""
+msgstr "Otevřít složku..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
-msgstr ""
+msgstr "Přidat složku..."
 
 #: src/skins-qt/skins_cfg.cc:197 src/skins/skins_cfg.cc:181
 msgid "Player:"
@@ -3486,7 +3741,7 @@ msgstr "Vyberte font pro seznam skladeb:"
 
 #: src/skins-qt/skins_cfg.cc:206 src/skins/skins_cfg.cc:190
 msgid "<b>Skin</b>"
-msgstr ""
+msgstr "<b>Téma vzhledu</b>"
 
 #: src/skins-qt/skins_cfg.cc:210 src/skins/skins_cfg.cc:192
 msgid "<b>Fonts</b>"
@@ -3514,7 +3769,7 @@ msgstr "Vlnovka"
 
 #: src/skins-qt/skins_cfg.cc:223 src/skins/skins_cfg.cc:205
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Zvukový otisk / VU metr"
 
 #: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Off"
@@ -3533,7 +3788,7 @@ msgstr "Oheň"
 
 #: src/skins-qt/skins_cfg.cc:230 src/skins/skins_cfg.cc:212
 msgid "Vertical lines"
-msgstr ""
+msgstr "Svislé čáry"
 
 #: src/skins-qt/skins_cfg.cc:234 src/skins/skins_cfg.cc:216
 msgid "Lines"
@@ -3552,7 +3807,7 @@ msgid "Slow"
 msgstr "Pomalé"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Střední"
 
@@ -3566,15 +3821,15 @@ msgstr "Nejrychlejší"
 
 #: src/skins-qt/skins_cfg.cc:247 src/skins/skins_cfg.cc:229
 msgid "Dots"
-msgstr ""
+msgstr "Body"
 
 #: src/skins-qt/skins_cfg.cc:248 src/skins/skins_cfg.cc:230
 msgid "Line"
-msgstr ""
+msgstr "Čára"
 
 #: src/skins-qt/skins_cfg.cc:249 src/skins/skins_cfg.cc:231
 msgid "Solid"
-msgstr ""
+msgstr "Plná vlnovka"
 
 #: src/skins-qt/skins_cfg.cc:255 src/skins/skins_cfg.cc:237
 msgid "Ice"
@@ -3586,7 +3841,7 @@ msgstr "Plynulý"
 
 #: src/skins-qt/skins_cfg.cc:264 src/skins/skins_cfg.cc:246
 msgid "Coloring:"
-msgstr ""
+msgstr "Barevné schéma:"
 
 #: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Style:"
@@ -3594,19 +3849,19 @@ msgstr "Styl:"
 
 #: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Falloff:"
-msgstr ""
+msgstr "Klesání:"
 
 #: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Klesání vrcholku:"
 
 #: src/skins-qt/skins_cfg.cc:279 src/skins/skins_cfg.cc:261
 msgid "Scope Style:"
-msgstr ""
+msgstr "Styl vlnovky:"
 
 #: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Barevné schéma zvukového otisku:"
 
 #: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "VU Meter Style:"
@@ -3688,7 +3943,7 @@ msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
 msgid "Sndfile Plugin"
 msgstr "Sndfile modul"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3728,66 +3983,66 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio Výstup"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr "Zařízení (prázdné pro standardní)"
+msgstr "Zařízení (prázdné pro výchozí)"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Ulož a obnov hlasitost:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio chyba: Nepodporovaný zvukový formát (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio chyba: sio_open() selhal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio chyba: sio_setpar() selhal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio chyba: sio_start() selhal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Změna skladby"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Příkazy</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Spusť příkaz při spuštění nové skladby:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Spusť příkaz po skončení skladby:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Spusť příkaz po skončení přehrávání seznamu skladeb:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Spusť příkaz při změně názvu skladby (pro síťové proudy):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3801,22 +4056,35 @@ msgid ""
 "%t: Playlist position\n"
 "%T: Title (unformatted)"
 msgstr ""
-
-#: src/song_change/song_change.cc:296
+"%a: Umělec\n"
+"%b: Album\n"
+"%c: Počet kanálů\n"
+"%f: Název souboru (s úplnou cestou)\n"
+"%F: Frekvence (Hz)\n"
+"%l: Délka (v milisekundách)\n"
+"%n nebo %s: Formátovaný název (viz nastavení seznamu skladeb)\n"
+"%p: Momentálně přehrávaná skladba (1 nebo 0)\n"
+"%r: Datový tok (bity za sekundu)\n"
+"%t: Pozice v seznamu skladeb\n"
+"%T: Název (neformátovaný)"
+
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
+"Parametry předávané příkazovému řádku by měly být uzavřeny do uvozovek. "
+"Parametry v uvozovkách neuzavřené mohou vést k neočekávaným výsledkům."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
-msgstr ""
+msgstr "Informace o skladbě"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Sox převzorkování"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3830,43 +4098,43 @@ msgstr ""
 "Založeno na Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rychle"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Nízká"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Vysoká"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Velmi vysoká"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Rychlost a výška:"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Rychlost a výška</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Výška:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
@@ -3881,6 +4149,14 @@ msgid ""
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Zásuvný modul stavové ikony (částečný port rozhraní Qt)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Evžen Paskevič <eugene@raptor.kiev.ua>\n"
+"\n"
+"Tento zásuvný modul poskytuje stavovou ikonu umístěnou v\n"
+"prostoru systémové lišty okenního správce."
 
 #: src/statusicon-qt/statusicon.cc:78 src/statusicon/statusicon.cc:387
 msgid "Close to the system tray"
@@ -3888,15 +4164,15 @@ msgstr "Zavřít do systémové oblasti"
 
 #: src/statusicon-qt/statusicon.cc:85
 msgid "_Hide"
-msgstr ""
+msgstr "S_krýt"
 
 #: src/statusicon-qt/statusicon.cc:86
 msgid "_Restore"
-msgstr ""
+msgstr "Ob_novit"
 
 #: src/statusicon-qt/statusicon.cc:95 src/statusicon/statusicon.cc:284
 msgid "Se_ttings ..."
-msgstr ""
+msgstr "Nas_tavení..."
 
 #: src/statusicon/statusicon.cc:370
 msgid ""
@@ -3908,6 +4184,13 @@ msgid ""
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Zásuvný modul stavové ikony\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Tento zásuvný modul poskytuje stavovou ikonu umístěnou v\n"
+" prostoru systémové lišty okenního správce."
 
 #: src/statusicon/statusicon.cc:377
 msgid "<b>Mouse Scroll Action</b>"
@@ -3955,12 +4238,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Generátor tónu"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
@@ -3982,7 +4265,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Odstranění hlasu"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4043,31 +4326,55 @@ msgid ""
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Název: %t\n"
+"Autor: %a\n"
+"Od: %f\n"
+"Tracker: %T\n"
+"Komentář: %C\n"
+"Typ čipu: %c\n"
+"Stereo: %s\n"
+"Smyčka: %l\n"
+"Frekvence čipu: %F\n"
+"Frekvence přehrávače: %P\n"
+"Rok: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX Dekodér"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Přehrávač zvukového formátu Vortex: Alexandr Sašnov <sashnov@ngs.ru>\n"
+"Založeno na in_vtx.dll: Romana Šerbakov <v_soft@microfor.ru>\n"
+"Zásuvný modul pro Audacious: Pavel Vymetálek <pvymetalek@seznam.cz>"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
 
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Dekodér"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "Ztrátové (hybridní)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "Ztrátové"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4081,14 +4388,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Dekodér"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b> Konfigurace XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignoruj délku ze souboru"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"
diff --git a/po/da.po b/po/da.po
index 173a8cc..d562b77 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014
+# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014,2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Danish (http://www.transifex.com/jlindgren/audacious/language/"
 "da/)\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw)-afkoder"
 
@@ -27,20 +27,20 @@ msgstr "AAC (Raw)-afkoder"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-afspiller)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sekventeret"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Angiv alarm ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "Oprindelig skrevet af Adam Feakin og Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -102,147 +102,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Så gik alarmen."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Din huskeseddel for i dag er ..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Mondag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Fredag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Søndag"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tid"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarm (standard):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "t"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Stille efter:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "timer"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutter"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Vælg dagene hvor alarmen skal udløses"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dag"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Standard"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dage"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Overgang"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Lydstyrke"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Start"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Endelig"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Nuværende"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Yderligere kommando"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "aktiver"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Afspilningsliste (valgfri)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Vælg en afspilningsliste"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Hvad betyder disse indstillinger?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Omslag"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-lydkanal"
 
@@ -284,11 +284,11 @@ msgstr "Mikserenhed:"
 msgid "Mixer element:"
 msgstr "Mikserelement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-afspiller)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -311,68 +311,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Tilsidesæt standardforstærkning:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Tilsidesæt standardpolyfoni:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Tilsidesæt standardefterklang:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Tilsidesæt standardomkvæd:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Afspilning</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Trommeskift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Udelad foranstillet tavshed"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Udelad bagvedstillet tavshed"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -380,86 +380,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - vælg SoundFont-fil"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Åbn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Størrelse (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI-information </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Længde (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Antallet af numre:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI-kommentarer og sangtekster </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* ingen kommentarer tilgængelig i denne MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ingen sangtekster tilgængelige i denne MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Luk"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(Ugyldig UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -478,7 +492,7 @@ msgstr ""
 "Baseret delvist på Evan Martins Ghosd-bibliotek:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -530,94 +544,94 @@ msgstr "Pause deaktiveret"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Udløser OSD når pause fjernes fra afspilning "
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Placering"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relativ X-forskydning:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relativ Y-forskydning:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maks OSD-bredde:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Flerskærmsindstillinger"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Vis OSD med:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "alle skærme"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "skærm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Visning:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Ton ind:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Ton ud:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Skrifttype %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Skygge"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Optegningsstil"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Farver"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Farve %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Aktiver udløser"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Hændelse"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Composite-håndtering detekteret"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -627,60 +641,56 @@ msgstr ""
 "med mindre du ved at du har en kørende, så aktiver en composite-håndtering "
 "ellers vil OSD'en ikke fungere korrekt"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-håndtering er ikke krævet for falsk gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Falsk gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Reel gennemsigtighed (kræver X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite-udvidelse er ikke indlæst"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite-udvidelse er ikke tilgængelig"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Udløser"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -696,11 +706,11 @@ msgstr "ASXv1/ASXv2-afspilningslister"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious-afspilningslister (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Farve</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Sløret omfang"
 
@@ -724,15 +734,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Klip frekvens:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalyseprogram"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Lyd-cd-udvidelsesmodul"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -752,118 +762,118 @@ msgstr ""
 "\n"
 "Dette var et Google Summer of Code 2007-projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Enhed</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Læs hastighed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Tilsidesæt enhed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Brug CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Brug CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Brug HTTP i stedet for CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Sti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Kunne ikke initialisere cdio-undersystemet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ugyldig URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Nummeret %d blev ikke fundet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Spor %d er et dataspor."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Kunne ikke læse lyd-cd."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Lyd-cd"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Kunne ikke åbne cd-enhed %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Intet cd-drev med lyd blev fundet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Kunne ikke afslutte initialisering af åbnet cd-drev."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Kunne ikke indhente første/sidste nummer."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Kan ikke læse start/slut LSN for spor %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Kunne ikke oprette cddb-forbindelsen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Kunne ikke forespørge CDDB-serveren"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Kunne ikke forespørge CDDB-serveren: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Kunne ikke læse cddb-informationen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Drev er tomt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Disktype er ikke understøttet."
 
@@ -1027,58 +1037,60 @@ msgstr "Intensitet:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet-udvidelsesmodul"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Slet filer"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Kunne ikke flytte %s til papirkurven: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Kunne ikke slette %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Kunne ikke slette %s: ikke en lokal fil."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Ønsker du at flytte de valgte filer til papirkurven?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Flyt til papirkurven"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Ønsker du permanent at slette de valgte filer?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Slet"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Slet valgte filer"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Slettemetode</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Flyt til papirkurven i stedet for at slette øjeblikkeligt"
 
@@ -1120,11 +1132,11 @@ msgstr "Lydstyrke:"
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg-udvidelsesmodul"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1140,15 +1152,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter-udvidelsesmodul"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Vælg en mappe"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1165,194 +1173,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Filformat for lyden:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Gem i oprindelig mappe"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Opret filnavnet fra:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Original filnavn"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Original filmærke"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Foranstil rækkefølge for numrene til filnavnet"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Generelt"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Fælles stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmekvalitet"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bithastighed (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Komprimeringsforhold:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Lydtilstand:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Diverse:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Fremtving streng ISO-overholdelse"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Fejlbeskyttelse"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvalitet"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Aktiver VBH/GBH"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBH-indstillinger:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum for bithastighed (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimum for bithastighed (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Fremtving strengt minimum for bithastighed"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "GBH-indstillinger:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Gennemsnitlig bithastighed (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR-kvalitetsniveau:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Fremtving strengt minimum for bithastighed"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Udelad Xing VBR-teksthoved"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBH/GBH"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Billedparametre:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marker som ophavsret"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marker som original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3-parametre:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Fremtving tilføjelse af version 2-mærke"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Tilføj kun v1-mærke"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Tilføj kun v2-mærke"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBH/GBH"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Mærker"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kvalitetsniveau (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Generelt"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC-afkoder"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "uden kvalitetstab"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1364,7 +1456,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1372,19 +1464,19 @@ msgstr ""
 "GIO-udvidelsesmodul for Audacious\n"
 "Ophavsret 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO-udvidelsesmodul"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Læs og tilføj-tilstand er ikke understøttet"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Ugyldig åbn-tilstand"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1404,32 +1496,10 @@ msgstr ""
 "\n"
 "Licens: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL-spektrumanalyseprogram"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Ophavsret 2013 Christophe Budé, John Lindgren og Carlo Bramini\n"
-"Ophavsret 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Ophavsret 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson og "
-"4Front Technologies\n"
-"\n"
-"Licens: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Genvejstaster for GNOME"
@@ -1450,8 +1520,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Postnummer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titel"
@@ -1508,8 +1578,8 @@ msgstr "Tilgængelige kolonner"
 msgid "Displayed columns"
 msgstr "Viste kolonner"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Søgeværktøj"
 
@@ -1537,335 +1607,338 @@ msgstr "Fjern dok"
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Åbn filer ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Åbn a_dresse ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Tilføj filer ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "_Tilføj adresse ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Søg _bibliotek"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Om ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Indstillinger ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Afspil"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Forrige"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Næste"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Gentag"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Bland"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_Ingen næste afspilningsliste"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Stop _Efter denne sang"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Sanginformation ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_Hop til tid ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Hop til sang ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Angiv gentagelsespunkt _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Angiv gentagelsespunkt _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Ryd gentagelsespunkter"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Efter _titel"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Efter _filnavn"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Efter fil_sti"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Efter _rækkefølge for nummeret"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Efter _kunstner"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Efter al_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Efter _kunstner"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Efter _udgivelsesdato"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Efter _længde"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Efter _filsti"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Efter _tilpasset titel"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Omvendt rækkefølge"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Vilkårlig rækkefølge"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Opdater"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sorter"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Sorter _valgte"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Fjern dupletter"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Fjern _utilgængelige filer"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Ny"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Omdøb ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importer ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Eksporter ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Håndtering af _afspilningslister ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Køhåndtering ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Lydstyrke _op"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Lydstyrke _ned"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
-msgstr ""
+msgstr "_Equalizer ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "_Effekter ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
-msgstr ""
+msgstr "_Optag strøm"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
-msgstr ""
+msgstr "_Lydindstillinger ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Vis _menubjælke"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Vis _informationsbjælke"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Vis _visualisering for informationsbjælken"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Vis _statusbjælke"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Vis _resterende tid"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualiseringer ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fil"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Afspilning"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Afspilningsliste"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Tjenester"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Lydudgang"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Vis"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Sæt i kø/fjern fra kø"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Klip"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Vælg _alle"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Omdøb ..."
 
@@ -1906,58 +1979,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr "Rul ved sangændring"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK-grænseflade"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Mellemlagrer ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanal"
 msgstr[1] "%d kanaler"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
-msgstr ""
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Tilstand for én."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Afspilningstilstand."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Stopper efter sang."
 
@@ -1965,9 +2037,9 @@ msgstr "Stopper efter sang."
 msgid "Previous track"
 msgstr "Forrige nummer"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Afspil"
 
@@ -1975,8 +2047,8 @@ msgstr "Afspil"
 msgid "Pause/Resume"
 msgstr "Pause/genoptag"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stop"
 
@@ -2075,7 +2147,7 @@ msgstr "<b>Genvejstast:</b>"
 msgid "_Add"
 msgstr "_Tilføj"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globale genvejstaster"
 
@@ -2094,35 +2166,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK-lydkanal"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Forbind automatisk til udgangsporte"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Kun %d JACK-udgangsporte blev fundet, men %d var krævet."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Kunen ikke forbinde til JACK-port %s"
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Kunne ikke forbinde til JACK-serveren; kører den?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2224,50 +2296,50 @@ msgstr "Forbind igen til LIRC-serveren"
 msgid "Wait before reconnecting:"
 msgstr "Vent før du forbinder igen:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki-udvidelsesmodul"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Ingen sangtekster er tilgængelige"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Fejl"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Kunne ikke hente %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Kunne ikke fortolke %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Kigger efter sangtekster ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Manglende sangmetadata"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Forbinder til lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
-msgstr ""
+msgstr "Rediger sangtekster ..."
 
 #: src/m3u/m3u.cc:32
 msgid "M3U Playlists"
@@ -2275,19 +2347,19 @@ msgstr "M3U-afspilningslister"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Tact-opretter"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact-opretter: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact-opretter: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2295,6 +2367,11 @@ msgid ""
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"En Tact-opretter af Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"For at bruge den tilføjes en adresse: tact://beats*num/den\n"
+"f.eks. tact://77 for afspil 77 slag per minut\n"
+"eller tact://60*3/4 for afspil 60 bpm i 3/4-takt"
 
 #: src/mixer/mixer.cc:38
 msgid "Channel Mixer"
@@ -2437,15 +2514,15 @@ msgstr "Disse indstillinger vil træde i kraft når Audacious bliver genstartet"
 msgid "MPG123 Plugin"
 msgstr "MPG123-udvidelsesmodul"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avanceret</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Brug præcis længdeberegning (langsom)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2457,35 +2534,35 @@ msgstr "MPRIS 2-server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS-udvidelsesmodul"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Der opstod en fejl ved videresendelse af fortolkning"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ukendt HTTP-fejl"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Der opstod en fejl ved fortolkning af adresse"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "For mange videresendelser"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious afspiller ikke."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Skrivebordspåmindelser"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2505,15 +2582,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Vis afspilningskontroller"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Vis altid påmindelse"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Inkluder albumnavn i påmindelse"
 
@@ -2521,21 +2598,21 @@ msgstr "Inkluder albumnavn i påmindelse"
 msgid "Show"
 msgstr "Vis"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pause"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Næste"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4-lydkanal"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3-udgang"
 
@@ -2577,23 +2654,23 @@ msgstr ""
 "Jeg vil gerne takke folk på #audacious, specielt Tony Vroon og John Lindgren "
 "og selvfølgelig forfatterne af det tidligere OSS-udvidelsesmodul."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Afspilningshåndtering"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Poster"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Omdøb"
 
@@ -2605,51 +2682,34 @@ msgstr "PLS-afspilningslister"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2-afkoder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio-lydkanal"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio Output Plugin\n"
-"\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"
-"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,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia-udgang"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2663,47 +2723,73 @@ msgstr ""
 "Baseret på  SDL Output Plugin for Audacious\n"
 "Ophavsret 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Ophavsret 2013 Christophe Budé, John Lindgren og Carlo Bramini\n"
+"Ophavsret 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Ophavsret 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson og "
+"4Front Technologies\n"
+"\n"
+"Licens: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Arbejder ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Søg"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Loginspektør ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Åbn filer"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Tilføj filer"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Gentag"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Bland"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Åbn mappe ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Tilføj mappe ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Loginspektør ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt-grænseflade"
 
@@ -2745,7 +2831,7 @@ msgstr "<b>Konvertering</b>"
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Hastighed:"
 
@@ -2797,54 +2883,41 @@ msgstr "176,4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Tilladelse nægtet"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Hold dette vindue åben og klik så på »Kontroller rettighed« igen.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netværksproblem."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"Der opstod et problem under forsøget på at kontakte Last.fm. Prøv igen "
-"senere."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Kontrollerer ..."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Kontroller rettighed"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Tilbagekald rettighed"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2877,7 +2950,7 @@ msgstr ""
 "projekt.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2885,11 +2958,11 @@ msgstr ""
 "Audacious bruger nu en forbedret version af Last.fm Scrobbler.\n"
 "Kontroller præferencerne for Scrobbler-udvidelsesmodulet."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-lydkanal"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2897,58 +2970,58 @@ msgstr ""
 "SDL Output Plugin for Audacious\n"
 "Ophavsret 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Bibliotek"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultat"
 msgstr[1] "%d resultater"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d skjult)"
 msgstr[1] "(%d skjulte)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d sang"
 msgstr[1] "%d sange"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "i denne genre"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "på"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "af"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Opret afspilningsliste"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Tilføj til afspilningsliste"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Søg bibliotek"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2956,11 +3029,11 @@ msgstr ""
 "For at importere dit musikbibliotek til Audacious skal du vælge en mappe og "
 "så klikke på ikonet »Opdater«."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Vent venligst ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Vælg mappe"
 
@@ -3022,15 +3095,15 @@ msgstr ""
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Aktiver undertoner"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorer undertoner kortere end:"
 
 #: src/sid/xs_config.cc:105
 msgid "<b>Note</b>"
-msgstr ""
+msgstr "<b>Node</b>"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
@@ -3056,17 +3129,17 @@ msgstr "Tærskel:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
-msgstr ""
+msgstr "Gentagelsespunkter ryddet."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
-msgstr ""
+msgstr "Gentagelsespunkt A-sæt."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
-msgstr ""
+msgstr "Gentagelsespunkt B-sæt."
 
 #: src/skins/equalizer.cc:224 src/skins-qt/equalizer.cc:220
 msgid "Preamp"
@@ -3116,373 +3189,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious-equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Søg til %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lydstyrke: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% venstre"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: centrum"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% højre"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu for indstillinger"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Deakiver »Altid øverst«"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Aktiver »Altid øverst«"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Filinformationsboks"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dobbelt størrelse"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
-msgstr ""
+msgstr "Optagelse aktiveret"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
-msgstr ""
+msgstr "Optagelse deaktiveret"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
-msgstr ""
+msgstr "Lydstyrke op"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
-msgstr ""
+msgstr "Lydstyrke ned"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
-msgstr ""
+msgstr "Effekter ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
-msgstr ""
+msgstr "Optag strøm"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
-msgstr ""
+msgstr "Lydindstillinger ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Åbn filer ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Åbn adresse ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Søg i biblioteket"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Afspilning"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
-msgstr ""
+msgstr "Lydudgang"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Vis"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Tjenester"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Om ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Indstillinger ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Sanginformation ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
-msgstr ""
+msgstr "Bland efter album"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Ingen næste afspilningsliste"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Stop efter denne sang"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Angiv A_B-gentagelse"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Ryd A-B-gentagelse"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Gå til sang ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Gå til tidspunkt ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
-msgstr ""
+msgstr "Afspil/genoptag"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Ny afspilningsliste"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Omdøb afspilningsliste ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Fjern afspilningsliste"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Forrige afspilningsliste"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Næste afspilningsliste"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importer afspilningsliste ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Eksporter afspilningsliste ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Håndtering af afspilningslister ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Køhåndtering ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Opdater afspilningsliste"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Vis redigeringsprogram for afspilningslister"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Vis equalizer"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Vis tilbageværende tid"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Altid øverst"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "På alle arbejdsrum"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Tilføj adresse ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Tilføj filer ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Efter titel"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
-msgstr ""
+msgstr "Efter filnavn"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Efter filsti"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Ryd kø"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Fjern utilgængelige filer"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Fjern duplikater"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Fjern dem som ikke er valgt"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Fjern de valgte"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Søg og vælg"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Vend markering om"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Vælg ingen"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Vælg alle"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Efter rækkefølge"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Efter kunstner"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Efter album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Efter kunster"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Efter udgivelsesdato"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
-msgstr ""
+msgstr "Efter genre"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
-msgstr ""
+msgstr "Efter længde"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
-msgstr ""
+msgstr "Efter tilpasset titel"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Sæt listen i vilkårlig rækkefølge"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Vend listen om"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Sorter valgt"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Sorter listen"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Klip"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Indsæt"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Tilføj/fjern fra kø"
 
@@ -3495,17 +3576,17 @@ msgstr "Redigeringsprogram for Audacious' afspilningslister"
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamps klassiske brugerflade"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
-msgstr ""
+msgstr "Åbn mappe ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
-msgstr ""
+msgstr "Tilføj mappe ..."
 
 #: src/skins-qt/skins_cfg.cc:197 src/skins/skins_cfg.cc:181
 msgid "Player:"
@@ -3591,7 +3672,7 @@ msgid "Slow"
 msgstr "Langsom"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Mellem"
 
@@ -3727,7 +3808,7 @@ msgstr "Opret en ny afspilningsliste med matchende punkter"
 msgid "Sndfile Plugin"
 msgstr "Sndfile-udvidelsesmodul"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3749,67 +3830,67 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio-lydudgang"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Enhed (tom for standard):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Gem og gendan lydstyrke:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-fejl: Lydformat er ikke understøttet (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-fejl: sio_open() mislykkedes"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-fejl: sio_setpar() mislykkedes"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-fejl: sio_start() mislykkedes"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Sangændring"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Kommandoer</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Kommando til afvikling ved ny sang:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Kommando til afvikling ved afsluting på sang:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Kommando til afvikling ved slut på afspilningsliste:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Kommando til afvikling når sangtitlen ændrer sig (for netværksudsendelser):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3824,21 +3905,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3847,43 +3928,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Lav"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Høj"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Meget høj"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Hastighed og tonehøjde"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Hastighed og tonehøjde</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tonehøjde:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Statusikon"
 
@@ -3979,12 +4060,12 @@ msgstr "<b>Ekstra stereo</b>"
 msgid "Tone Generator"
 msgstr "Toneopretter"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Tonegenerator:"
 
@@ -4007,7 +4088,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Stemmefjernelse"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4056,26 +4137,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX-afkoder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack-afkoder"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "kvalitetstab (hybrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "kvalitetstab"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4089,14 +4180,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF-afkoder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF-konfiguration</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorer længde fra fil"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable-afspilningslister (XSPF)"
diff --git a/po/de.po b/po/de.po
index b5b1d74..17e1dd9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 # Translators:
 # Chris <ppt23@lkj.hopto.org>, 2012
 # Chris <ppt23@lkj.hopto.org>, 2012
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014,2016
 # Maximilian Vesper <maximilian@mail.com>, 2013
 # mschwendt <mschwendt@fedoraproject.org>, 2012
 # mschwendt <mschwendt@fedoraproject.org>, 2012
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-11-25 18:00+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: German (http://www.transifex.com/jlindgren/audacious/language/"
 "de/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) Dekodierer"
 
@@ -34,20 +34,20 @@ msgstr "AAC (Raw) Dekodierer"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-Spieler)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "Sequenziell"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Alarm setzen ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Ursprünglich geschrieben von Adam Feakin und Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -155,147 +155,147 @@ msgstr ""
 "    Schreiben Sie die Erinnerungsnachricht in das Eingabefeld\n"
 "    und aktivieren Sie die Checkbox."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Dies ist Ihr Aufwachsignal."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Die Erinnerung für heute lautet..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Montag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarm um (Standard):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "Uhr"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Still nach:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "Stunden"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Tag"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Standard"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Tage"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Übergang"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Beginnen bei"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Schluss"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Momentan"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Zusätzlicher Befehl"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "aktivieren"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Wiedergabeliste (optional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Wiedergabeliste wählen"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Optionen"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Was bedeuten diese Einstellungen?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Album-Cover"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA Ausgabe"
 
@@ -338,11 +338,11 @@ msgstr "Mixer-Gerät:"
 msgid "Mixer element:"
 msgstr "Mixer-Element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-Spieler)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -384,68 +384,68 @@ msgstr ""
 "Tony Vroon\n"
 "für die gute Hilfe beim Testen"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Standard Verstärkung überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Standard Polyfonie überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Standard Hall überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "An"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Standard Refrain überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Wiedergabe</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponieren:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "Halbtöne"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Drum-Shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "Notennummern"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Stille am Anfang überspringen"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Stille am Ende überspringen"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Abtastrate:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -453,86 +453,106 @@ msgstr "Abtastrate:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont-Datei wählen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Größe (Bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Name:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Länge (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Anzahl an Titeln:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (Wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Zeitmultiplex:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Kommentare und Liedtexte </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* keine Kommentare in dieser MIDI-Datei verfügbar *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* keine Liedtexte in dieser MIDI-Datei verfügbar *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (ungültiges UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache Browser\n"
+"\n"
+"Ampache-Client für Audacious.\n"
+"\n"
+"Lizenz: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský und John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -551,7 +571,7 @@ msgstr ""
 "Zum Teil basierend auf der Ghosd Bibliothek von Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -603,94 +623,94 @@ msgstr "Pause Aus"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Platzierung"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relative X-Verschiebung:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relative Y-Verschiebung:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maximale OSD-Breite:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Multi-Head-Optionen"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD anzeigen auf:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "allen Bildschirmen"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "Bildschirm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Zeitablauf (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Anzeige:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Einblenden:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Ausblenden:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Schriftart %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Schatten"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Render-Stil"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Farben"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Farbe %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Auslöser aktivieren"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Composite-Manager erkannt"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -700,60 +720,56 @@ msgstr ""
 "Sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, "
 "ansonsten wird das OSD nicht funktionieren"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-Manager nicht benötigt für vorgetäuschte Transparenz"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Pseudo-Transparenz"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte Transparenz (benötigt X-Composite-Erweiterung)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite-Erweiterung nicht geladen"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite-Erweiterung nicht verfügbar"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious-OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -769,11 +785,11 @@ msgstr "ASXv1/ASXv2 Wiedergabelisten"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Wiedergabelisten (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Farbe</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Oszilloskop"
 
@@ -797,15 +813,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Grenzfrequenz:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalysator"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio-CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -826,118 +842,118 @@ msgstr ""
 "\n"
 "Dies war ein Google Summer of Code 2007 Projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Gerät</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Lesegeschwindigkeit:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Gerät überschreiben:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadaten</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "CD-Text benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP anstatt CDDBP benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Pfad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Initialisieren des cdio Subsystems fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ungültige URI »%s«."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Titel %d nicht gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Titel %d ist eine Datenspur."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Fehler beim Lesen der Audio-CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Öffnen des CD-Laufwerks »%s« fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Kein geeignetes CD-Laufwerk gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Abschließen der Initialisierung des CD-Laufwerks fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Abfragen der ersten/letzten Titelnummer fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Kann Start/Ende LSN für Titel %d nicht lesen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Herstellen der CDDB Verbindung fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Lesen der CDDB Information fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Laufwerk ist leer."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nicht unterstützter Disk-Typ."
 
@@ -1107,58 +1123,60 @@ msgstr "Intensität:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cuesheet Plugin"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Dateien löschen"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Fehler beim Verschieben von »%s« in den Papierkorb: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Fehler beim Löschen von »%s«: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Fehler beim Löschen von »%s«: Datei nicht lokal gespeichert."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Möchten Sie die ausgewählten Dateien in den Papierkorb verschieben?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "In den Papierkorb verschieben"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Möchten Sie die ausgewählten Dateien dauerhaft löschen?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Ausgewählte Dateien löschen"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Löschmethode</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "In den Papierkorb verschieben anstatt sofort zu löschen"
 
@@ -1200,11 +1218,11 @@ msgstr "Lautstärke:"
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,15 +1238,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter Plugin"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Verzeichnis wählen"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1258,194 +1272,278 @@ msgstr ""
 "Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Ausgabedateiformat:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "In Ursprungsverzeichnis speichern"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "In benutzerdefiniertes Verzeichnis speichern:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Dateiname generieren von:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Ursprünglichem Dateiname"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Ursprünglicher Dateiname (kein Suffix)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Titelnummer an Dateiname voranstellen"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Allgemein"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algorithmen-Qualität:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Ausgabe-Abtastrate:"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Algorithmusqualität:"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Kompressionsverhältnis:"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audio-Modus:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Sonstiges:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Audiomodus:"
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Strikte ISO-Konformität erzwingen"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Fehlerschutz"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualität"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR aktivieren"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR-Optionen:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimale Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximale Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Minimale Bitrate:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Minimale Bitrate erzwingen"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Maximale Bitrate:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR-Optionen:"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Durchschnittliche Bitrate:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Durchschnittliche Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR-Qualitätsstufe:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Minimale Bitrate erzwingen"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Xing-VBR-Header auslassen"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Frame-Parameter:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Frame-Headers</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Als Copyright kennzeichnen"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Als Original kennzeichnen"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3-Parameter:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3-Schlagwörter</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Hinzufügen von Version-2-Tags erzwingen"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Nur v1-Tag hinzufügen"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Nur v2-Tag hinzufügen"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualität"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Qualitätsstufe (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Qualität (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Allgemein"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC Dekodierer"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "Verlustfrei"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1457,7 +1555,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1465,19 +1563,19 @@ msgstr ""
 "GIO Plugin für Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "»Lesen-und-Anhängen«-Modus nicht unterstützt"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Ungültiger Modus zum Öffnen"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1497,32 +1595,10 @@ msgstr ""
 "\n"
 "Lizenz: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spektrumanalysator"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Spektrumanalysator für Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren und Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basierend auf dem XMMS Plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson und "
-"4Front Technologies\n"
-"\n"
-"Lizenz: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME-Tastenkürzel"
@@ -1543,8 +1619,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Eintragsnummer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titel"
@@ -1601,8 +1677,8 @@ msgstr "Verfügbare Spalten"
 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Suchwerkzeug"
 
@@ -1630,335 +1706,338 @@ msgstr "Abdocken"
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Dateien öffnen ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "_URL öffnen ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Dateien _hinzufügen ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL hinzufügen ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Durchsuche _Sammlung"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Info ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Einstellungen ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Vorheriger"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Nächster"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Wieder_holen"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Nach Album _mischen"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Nach _diesem Titel stoppen"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Titel_info ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Zu Z_eitangabe springen ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Zu _Titel springen ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Wiederholpunkt _A setzen"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Wiederholpunkt _B setzen"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "Wiederholpunkte _löschen"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Nach _Titel"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Nach _Dateinamen"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Nach Datei_pfad"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Nach Titel_nummer"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Nach _Künstler"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Nach _Album"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Nach Albu_m-Künstler"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Nach _Genre"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Nach _Länge"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Nach _Dateipfad"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Nach _benutzerdefiniertem Titel"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Vertausche Anordnung"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Zufällige Anordnung"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Abspielen/Fortsetzen"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "Aktualisie_ren"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Auswahl sor_tieren"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "_Duplikate entfernen"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Nicht _verfügbare Dateien entfernen"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Neu"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Umbenennen ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Löschen"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importieren ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportieren ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Wiedergabelisten-Manager ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Warteschlangen-_Manager ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Lautstärke _verringern"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Equalizer ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_ffekte ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "Audio _aufnehmen"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Audio-Einstellungen ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Vis_ualisierungen im Infobereich"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Verbleibende _Zeit anzeigen"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualisierungen ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Wiederga_beliste"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "Die_nste"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Ausgabe"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "An_sicht"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Beinhaltenden Ordner öffen"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "Ausgewählte aktualisie_ren"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Am _Ende einfügen"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Umbenennen ..."
 
@@ -1999,58 +2078,57 @@ msgstr "Zeitspanne für Pfeiltasten:"
 msgid "Scroll on song change"
 msgstr "Mit Titelwechsel scrollen"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Puffern ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d Kanal"
 msgstr[1] "%d Kanäle"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
@@ -2058,9 +2136,9 @@ msgstr "Nach Titel stoppen."
 msgid "Previous track"
 msgstr "Vorheriger Titel"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Wiedergabe"
 
@@ -2068,8 +2146,8 @@ msgstr "Wiedergabe"
 msgid "Pause/Resume"
 msgstr "Pause/Fortsetzen"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stopp"
 
@@ -2168,7 +2246,7 @@ msgstr "<b>Tastenkombination:</b>"
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globale Tastenkürzel"
 
@@ -2198,25 +2276,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK Ausgabe"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automatisch mit Ausgabeports verbinden"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Nur %d JACK Ausgabeports gefunden, aber %d erforderlich."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Verbinden zu JACK Port %s fehlgeschlagen."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2224,11 +2302,11 @@ msgstr ""
 "JACK unterstützt nur Gleitkomma Audio. Sie müssen die Ausgabe Bittiefe in "
 "den Audacious Einstellungen auf »Gleitkomma« ändern."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Verbinden zum JACK Server fehlgeschlagen. Ist er aktiv?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2332,48 +2410,48 @@ msgstr "Zum LIRC Server wiederverbinden"
 msgid "Wait before reconnecting:"
 msgstr "Zeitspanne bis zum Wiederverbinden:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki Plugin"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Keine Liedtexte verfügbar"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Fehler"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Abrufen von »%s« nicht möglich"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Parsen von »%s« nicht möglich"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Suche nach Liedtexten ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Fehlende Titel-Metadaten"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Verbinde zu lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Liedtext bearbeiten ..."
 
@@ -2385,17 +2463,17 @@ msgstr "M3U Wiedergabelisten"
 msgid "Tact Generator"
 msgstr "Takt-Generator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d BPM"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d BPM %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2550,15 +2628,15 @@ msgstr "Diese Einstellungen treten in Kraft, wenn Audacious neugestartet wird."
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Erweitert</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Nutze exakte Längenberechnung (langsam)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2570,35 +2648,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Fehler beim Parsen der Weiterleitung"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Unbekannter HTTP Fehler"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Fehler beim Parsen der URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Zu viele Weiterleitungen"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Gestoppt"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious spielt gerade nichts ab."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Desktop-Benachrichtigungen"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2634,15 +2712,15 @@ msgstr ""
 "Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
 "Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Bedienelemente für Wiedergabe anzeigen"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Benachrichtigungen immer anzeigen"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Albumname in Benachrichtigung einschließen"
 
@@ -2650,21 +2728,21 @@ msgstr "Albumname in Benachrichtigung einschließen"
 msgid "Show"
 msgstr "Anzeigen"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pause"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Nächster"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 Ausgabe"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 Ausgabe"
 
@@ -2706,23 +2784,23 @@ msgstr ""
 "Ich möchte den Personen auf #audacious danken, vor allem Tony Vroon und John "
 "Lindgren sowie natürlich den Autoren des bisherigen OSS Plugins."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Wiedergabelisten-Manager"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Einträge"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Löschen"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Umbenennen"
 
@@ -2734,50 +2812,49 @@ msgstr "PLS Wiedergabelisten"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekodierer"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio Ausgabe"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Audacious PulseAudio Ausgabeplugin\n"
 "\n"
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der\n"
-"GNU General Public License, wie von der Free Software Foundation\n"
-"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2\n"
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
 "der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
 "\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen\n"
-"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die\n"
-"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
 "BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
 "\n"
-"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem\n"
-"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Ausgabe"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2791,47 +2868,73 @@ msgstr ""
 "Basierend auf dem SDL Ausgabeplugin für Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spektrumanalysator für Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren und Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Basierend auf dem XMMS Plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson und "
+"4Front Technologies\n"
+"\n"
+"Lizenz: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "In Bearbeitung ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Information"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Suchen"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Ordner öffnen ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "Ordner hin_zufügen ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Protoko_ll-Inspektor ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Dateien öffnen"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Dateien hinzufügen"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Vorheriger"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Wiederholen"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Zufällige Wiedergabe"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Ordner öffnen ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "Ordner hin_zufügen ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Protoko_ll-Inspektor ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt Interface"
 
@@ -2875,7 +2978,7 @@ msgstr "<b>Konvertierung</b>"
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Abtastrate:"
 
@@ -2927,63 +3030,49 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbeln für Profil: »%s«"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Zugriff verweigert"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-"Besuchen Sie den folgenden Link, um Audacious das Scrobbeln Ihrer Titel zu "
-"erlauben:"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm-Zugang wird überprüft ..."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Lassen Sie das Fenster geöffnet und klicken Sie erneut auf »Berechtigung "
-"überprüfen«.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Keine Sorge, Ihre Scrobbels sind auf Ihrem Computer gespeichert.\n"
-"Sie werden übermittelt, sobald Audacious die Berechtigung dazu hat."
+"Ihre Scrobbels werden temporär auf Ihrem Computer zwischengespeichert. Sie "
+"werden übermittelt, sobald Audacious die Berechtigung dazu hat."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netzwerkproblem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Berechtigung erteilt. Starte Scrobbeln für Benutzer %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Es gab ein Problem bei der Verbindung zu Last.fm. Bitte versuchen Sie es "
-"später noch einmal."
+"Zugriff verweigert. Öffnen Sie die folgende URL in einem Browser, erlauben "
+"Sie Audacious den Zugriff auf Ihr Profil und klicken Sie anschließend erneut "
+"auf »Berechtigung überprüfen«."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Überprüfen..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Es gab ein Problem bei der Verbindung zu Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Berechtigung überprüfen"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Berechtigung überprüfen"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "Berechtigung _entziehen"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Berechtigung entziehen"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Sie müssen Audacious erlauben, Titel zu Ihrem Last.fm Profil scrobbeln zu "
-"dürfen.\n"
+"Sie müssen Audacious erlauben Titel zu Ihrem Last.fm Profil scrobbeln zu "
+"dürfen."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3014,7 +3103,7 @@ msgstr ""
 "Danke an John Lindgren für die anfängliche Hilfe bei diesem Projekt.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3022,11 +3111,11 @@ msgstr ""
 "Audacious benutzt jetzt die verbesserte Version des Last.fm Scrobblers.\n"
 "Bitte prüfen Sie die Einstellungen für das Scrobbler Plugin."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL Ausgabe"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3034,58 +3123,58 @@ msgstr ""
 "SDL Ausgabeplugin für Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Sammlung"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d Ergebnis"
 msgstr[1] "%d Ergebnisse"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d versteckt)"
 msgstr[1] "(%d versteckt)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d Titel"
 msgstr[1] "%d Titel"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "dieses Genres"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "in"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "von"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "Wiedergabeliste _erstellen"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Zur Wiedergabeliste _hinzufügen"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Durchsuche Sammlung"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3093,11 +3182,11 @@ msgstr ""
 "Wählen Sie einen Ordner und klicken Sie auf »Aktualisieren«, um Ihre "
 "Musiksammlung in Audacious zu importieren."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Bitte warten ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Ordner auswählen"
 
@@ -3193,15 +3282,15 @@ msgstr "Grenzbereich:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Wiederholpunkte geloescht."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Wiederholpunkt A gesetzt."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Wiederholpunkt B gesetzt."
 
@@ -3253,373 +3342,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lautstaerke: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% links"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: Mitte"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% rechts"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Optionen"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "'Immer im Vordergrund' aus"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "'Immer im Vordergrund' an"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Dateiinformationen"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Doppelte Größe"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualisierungen"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Aufnahme aktiv"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Aufnahme inaktiv"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Lautstärke erhöhen"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Lautstärke verringern"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Effekte ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Audio aufnehmen"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Audio-Einstellungen ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Dateien öffnen ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "URL öffnen ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Durchsuche Sammlung"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Ausgabe"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ansicht"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Dienste"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Info ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Einstellungen ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Titelinfo ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Nach Album mischen"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Wiedergabeliste nicht weiterspielen"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Nach diesem Titel stoppen"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "A-B Wiederholung setzen"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "A-B Wiederholung leeren"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Zu Titel springen ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Zu Zeitangabe springen ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Abspielen/Fortsetzen"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Wiedergabeliste umbenennen ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Wiedergabeliste löschen"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Vorherige Wiedergabeliste"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Nächste Wiedergabeliste"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Wiedergabeliste importieren ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Wiedergabeliste exportieren ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Wiedergabelisten-Manager ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Warteschlangen-Manager ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Wiedergabeliste aktualisieren"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Wiedergabeliste anzeigen"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Equalizer anzeigen"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Verbleibende Zeit anzeigen"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Auf allen Arbeitsflächen"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Hauptfenster aufrollen"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Wiedergabeliste aufrollen"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Equalizer aufrollen"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "URL hinzufügen ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Dateien hinzufügen ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Nach Titel"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Nach Dateinamen"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Nach Dateipfad"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Alle entfernen"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Warteschlange löschen"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Nicht verfügbare Dateien entfernen"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Duplikate entfernen"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Nicht ausgewählte entfernen"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Auswahl entfernen"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Suchen und Auswählen"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Auswahl invertieren"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Keine auswählen"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Nach Titelnummer"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Nach Künstler"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Nach Album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Nach Album-Künstler"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Nach Erscheinungsdatum"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Nach Genre"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Nach Länge"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Nach benutzerdefiniertem Titel"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Wiedergabeliste zufällig anordnen"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Wiedergabeliste umkehren"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Auswahl sortieren"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Wiedergabeliste sortieren"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Beinhaltenden Ordner öffen"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Am Ende einfügen"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "In/Aus Warteschlange"
 
@@ -3632,15 +3729,15 @@ msgstr "Audacious Wiedergabeliste"
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp Interface"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Ordner öffnen ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Ordner hinzufügen ..."
 
@@ -3728,7 +3825,7 @@ msgid "Slow"
 msgstr "Langsam"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Normal"
 
@@ -3865,7 +3962,7 @@ msgstr "Erstelle neue Wiedergabeliste mit passenden Einträgen"
 msgid "Sndfile Plugin"
 msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3905,62 +4002,62 @@ msgstr ""
 "Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio-Ausgabe"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Gerät (leer für Standard):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Lautstärke speichern und wiederherstellen:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-Fehler: Nicht unterstütztes Audioformat (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-Fehler: sio_open() fehlgeschlagen"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-Fehler: sio_setpar() fehlgeschlagen"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-Fehler: sio_start() fehlgeschlagen"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Titelwechsel"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Befehle</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Auszuführender Befehl, wenn Audacious einen neuen Titel startet:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Auszuführender Befehl am Ende eines Titels:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Auszuführender Befehl am Ende der Wiedergabeliste:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei "
 "Netzwerkstreams):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3969,7 +4066,7 @@ msgstr ""
 "Befehls ersetzt werden (nicht alle sind sinnvoll für den »Ende-der-"
 "Wiedergabeliste«-Befehl):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3995,7 +4092,7 @@ msgstr ""
 "%t: Wiedergabelistenposition\n"
 "%T: Titel (unformatiert)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4003,15 +4100,15 @@ msgstr ""
 "Parameter sollten in Anführungszeichen eingeschlossen sein. Keine "
 "Anführungszeichen zu verwenden kann zu unerwarteten Ergebnissen führen."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Titelinfo"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4025,43 +4122,43 @@ msgstr ""
 "Basierend auf dem Abtastraten-Konverter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Schnell"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Niedrig"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Hoch"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Sehr hoch"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualität:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Geschwindigkeit und Tonhöhe"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Geschwindigkeit und Tonhöhe</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tonhöhe:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Status-Icon"
 
@@ -4165,12 +4262,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Ton-Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
@@ -4193,7 +4290,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Stimmenaufhebung"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4270,7 +4367,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Dekodierer"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4280,19 +4377,31 @@ msgstr ""
 "Basierend auf in_vtx.dll von Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious Plugin von Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin für Audacious\n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Dekodierer"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "Verlustbehaftet (Hybrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "Verlustbehaftet"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4306,14 +4415,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Dekodierer"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF Konfiguration</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Länge aus Datei ignorieren"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Wiedergabelisten (XSPF)"
diff --git a/po/el.po b/po/el.po
index ba21b60..a743949 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,14 +8,14 @@
 # DImitrios Zakas <jim.thomas.zks@gmail.com>, 2013
 # Wasilis Mandratzis-Walz, 2015
 # Wasilis Mandratzis-Walz, 2015
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012-2013
+# Γιάννης Ανθυμίδης, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-10-30 15:09+0000\n"
-"Last-Translator: Michael Misirlis <mmisirlis@gmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Greek (http://www.transifex.com/jlindgren/audacious/language/"
 "el/)\n"
 "Language: el\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Αποκωδικοποιητής AAC (Raw)"
 
@@ -32,20 +32,20 @@ msgstr "Αποκωδικοποιητής AAC (Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Αναπαραγωγή AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "αλληλουχία"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Ξυπνητήρι"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Ρύθμιση συναγερμού ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +55,7 @@ msgstr ""
 "σε ένα ορισμένο χρονικό διάστημα.\n"
 "Αρχικά γραμμένο από τον Adam Deakin και τον Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -150,147 +150,147 @@ msgstr ""
 "    Πληκτρολογήστε την υπενθύμιση στο πεδίο κειμένου και τικάρετε\n"
 "    το κουτάκι αν θέλετε να εμφανίζεται."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Αυτή είναι η κλήση αφύπνισης."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Η υπενθύμιση σας για σήμερα είναι..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Χρόνος"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Κτύπα στις (προεπιλογή):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "ώ"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Σίγαση μετά από"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "ώρες"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "λεπτά"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Διαλέξτε τις ημέρες που θα χτυπήσει το ξυπνητήρι"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Ημέρα"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Ημέρες"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Ξεθωριάζει"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Ένταση"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Ξεκινάει στις"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Τελικό"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Τωρινό"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Επιπλέον Εντολή"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "ενεργοποίηση"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Λίστα αναπαραγωγής (προαιρετική)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Επιλέξτε μια λίστα αναπαραγωγής"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Τι σημαίνουν αυτές οι επιλογές;"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Εξώφυλλο Άλμπουμ"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Έξοδος ALSA"
 
@@ -333,11 +333,11 @@ msgstr "Συσκευή μείκτη:"
 msgid "Mixer element:"
 msgstr "Στοιχείο μείκτη:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Αναπαραγωγή MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -379,68 +379,68 @@ msgstr ""
 "Τόνι Vroon\n"
 "για την καλή βοήθεια με άλφα δοκιμή"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Παράκαμψη προεπιλεγμένης αύξησης:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Παράκαμψη προεπιλεγμένης πολυφωνίας:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Παράκαμψη προεπιλεγμένης αντήχησης:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ενεργοποιηση"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Παράκαμψη προεπιλεγμένου ρεφρέν:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Αναπαραγωγή</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Μεταφορά: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "ημιτόνια"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Τύμπανο μετατόπιση:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "αριθμοί υπό σημείωση"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Μετάβαση κορυφαίας σιωπής"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Μετάβαση κορυφαίας σιωπής"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "ρυθμός δείγματος:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -448,86 +448,100 @@ msgstr "ρυθμός δείγματος:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - επιλέξτε αρχείο SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Μέγεθος (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Πληροφορίες MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Μήκος (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Αρ. Κομματιών"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "μεταβλητή"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Χρόνος:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Σχόλια και Στοίχοι MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* δεν υπάρχουν σχόλια σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* δεν υπάρχουν στίχοι σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (μη έγκυρο UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -546,7 +560,7 @@ msgstr ""
 "Βασίζεται εν μέρει στην Ghosd βιβλιοθήκη του Evan Μάρτιν:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Απεικόνιση στην Οθόνη)"
 
@@ -599,94 +613,94 @@ msgstr "Παύση Ανενεργή"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Αφυπνιση OSD όταν δεν γίνεται παύση της αναπαραγωγής."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Τοποθέτηση"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Σχετικό Χ offset:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Σχετικό Y offset:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Πλάτος αφυπνισης OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Επιλογές για πολλαπλές οθόνες"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Προβολή OSD με χρήση:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "όλες οι οθόνες"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "οθόνη %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Συγχρονισμός (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Προβολή:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Ομαλή είσοδος:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Ξεθώριασμα:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Γραμματοσειρά %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Σκιά"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Απόδοση ύφους"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Χρώμα %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Ενεργοποίηση έναυσματος"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Συμβάν"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Διαχειριστής σύνθετων ανιχνεύθηκε"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -696,60 +710,56 @@ msgstr ""
 "εκτός και αν γνωρίζετε ότι έχετε μια λειτουργία, ενεργοποιήστε ένα σύνθετο "
 "διαχειριστής αλλιώς το OSD δεν θα λειτουργήσει σωστά"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Σύνθετο διαχειριστής δεν απαιτείται για ψεύτικη διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Ψεύτικη διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Πραγματική διαφάνεια (χρειάζεται X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Σύνθετη επέκταση δεν φορτώθηκε"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Σύνθετη επέκταση δεν είναι διαθέσιμη"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Θέση"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Κίνηση"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Διακοσμήση"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Εναυσμα"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Δοκιμή"
 
@@ -765,11 +775,11 @@ msgstr "Λίστες Αναπαραγωγής ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Λίστες Αναπαραγωγής Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Χρώμα</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Εμβέλεια"
 
@@ -793,15 +803,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Αποκοπή συχνότητας:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Αναλυτής Φάσματος"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Πρόσθετο Μουσικών CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -822,118 +832,118 @@ msgstr ""
 "\n"
 "Αυτό το πρόσθετο δημιουργήθηκε κατά το Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Συσκευή</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Ταχύτητα ανάγνωσης:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Παράκαμψη συσκευής:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Μεταδεδομένα</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Χρήση CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Χρήση CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Χρήση HTTP αντί CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Διαδρομή:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Απέτυχε η αρχικοποίηση του υποσυστήματος cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Μη έγκυρο URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Το κομμάτι %d δεν βρέθηκε."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Κομμάτι %d είναι ένα κομμάτι δεδομένων."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Σφάλμα ανάγνωσης CD ήχου."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Μουσικό CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Απέτυχε να ανοίξει τη συσκευή του CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Δεν υπάρχει ήχος ικανής μονάδας CD που βρέθηκε."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Αποτυχία για να ολοκληρωθεί η αρχικοποίηση ανοιχτής μονάδας CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Απέτυχε η ανάκτηση πρώτου/τελευταίου κομματιού."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Αδύνατη η ανάγνωση έναρξης/λήξης του LSD για το κομμάτι %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Αποτυχία για δημιουργία σύνδεσης CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Αποτυχία για την αναζήτηση του διακομιστή CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Αποτυχία για την αναζήτηση του διακομιστή CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Αποτυχία για αναγνωση των CDDB πληροφοριων: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Η μονάδα δίσκου είναι κενή."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Μη υποστηριζόμενος τύπος δίσκου."
 
@@ -1103,58 +1113,60 @@ msgstr "Ένταση:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Διαγραφή Αρχείων"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Σφάλμα κατά την μετακίνηση του %s στα άχρηστα: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Σφάλμα κατά τη διαγραφή %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Σφάλμα κατά τη διαγραφή %s: δεν είναι ένα τοπικό αρχείο."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Θέλετε να μεταφέρετε τα επιλεγμένα στον κάδο ανακύκλωσης;"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Μετακίνηση στον κάδο"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Θέλετε να διαγράψετε μόνιμα τα επιλεγμένα αρχεία;"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Διαγραφή Επιλεγμένων Αρχείων"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Μέθοδος διαγραφής</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Μετακίνηση στα απορρίμματα αντί να διαγραφθουν αμέσως"
 
@@ -1197,11 +1209,11 @@ msgstr "Ένταση:"
 msgid "Echo"
 msgstr "Ηχώ"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Πρόσθετο FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1217,15 +1229,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Πρόσθετο FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Επιλογή φακέλου"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1255,194 +1263,278 @@ msgstr ""
 "με αυτό το πρόγραμμα. Εάν όχι, γράψτε στο Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Μορφή αρχείου εξόδου:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Αποθήκευση στον αρχικό κατάλογο"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Αποθήκευση σε προσαρμοσμένο κατάλογο:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Δημιουργία ονόματος αρχείου από:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Αρχικό όνομα αρχείου"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Αρχικό όνομα αρχείου (χωρίς κατάληξη)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Πρωτότυπη ετικέτα αρχείου"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Προσθέστε το πρόθεμα του αριθμου κομματιού στο όνομα αρχείου"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Γενικά"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Πολυπλεγμένο Στερεοφωνικό"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Μονοφωνικό"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Ποιότητα Αλγόριθμου:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Έξοδος ρυθμου δείγματος:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Αναλογία ρυθμού μετάδοσης/συμπίεσης:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Ρυθμός μετάδοσης δεδομένων (kb/s):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Λόγος συμπίεσης:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Λειτουργία Ήχου:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Διάφορα:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Εξαναγκασμός αυστηρής συμμόρφωσης με ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Προστασία σφαλμάτων"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Ποιότητα"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Ενεργοποίηση VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Τύπος:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Επιλογές VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Ελάχιστος ρυθμός μετάδοσης (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Μέγιστος ρυθμός μετάδοσης (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Αυστηρά εφάρμοσε ελάχιστο ρυθμό μετάδοσης"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Επιλογές ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Μέσος ρυθμός μετάδοσης (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Επίπεδο ποιότητας VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Αυστηρά εφάρμοσε ελάχιστο ρυθμό μετάδοσης"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omit Xing VBR header"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Παράμετροι πλαισίου:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Επισήμανση ως πνευματικά δικαιώματα"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Επισήμανση ως πρωτότυπο"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Παραμέτροι ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Επιπλέον Δύναμη της έκδοσης 2 tag"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Πρόσθεσε μόνο ετικέτα v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Πρόσθεσε μόνο ετικέτα v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Ποιότητα"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Ετικέτες"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Επίπεδο ποιότητας (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Γενικά"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Αποκωδικοποιητής FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "Χωρίς απώλειες"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,7 +1546,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1462,19 +1554,19 @@ msgstr ""
 "GIO Πρόσθετο για το Audacious\n"
 "Πνευματικά δικαιώματα 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Πρόσθετο GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Αναγνωση-και-προσάρτηση λειτουργίας δεν υποστηρίζονται"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Άκυρη ανοικτή λειτουργία"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1494,32 +1586,10 @@ msgstr ""
 "\n"
 "Άδεια: GPLv2 +"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Αναλυτής Φάσματος"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Αναλυτής φάσματος για το Audacious\n"
-"Copyright 2013 Christophe Bude, Τζον Lindgren, και ο Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Με βάση το πρόσθετο XMMS:\n"
-"Πνευματικά δικαιώματα 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, και 4Front Technologies\n"
-"\n"
-"Άδεια: GPLv2 +"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Συντομεύσεις GNOME"
@@ -1540,8 +1610,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Αριθμός εισαγωγής"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Τίτλος"
@@ -1598,8 +1668,8 @@ msgstr "Διαθέσιμες στήλες"
 msgid "Displayed columns"
 msgstr "Εμφανιζόμενες στήλες"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Εργαλέιο Αναζήτησης"
 
@@ -1627,335 +1697,338 @@ msgstr "Αποσυνδεση"
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Άνοιγμα Αρχείων..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Άνοιγμα _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Προσθήκη Αρχείων..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Προσθήκη U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "Σ_χετικά ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Ρυθμίσεις ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Αναπαραγωγή"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Παύσ_η"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Διακοπή"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Προ_ηγούμενο"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Επόμενο"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Επανάληψη"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Α_νακάτεμα"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Ανακάτεμα ανά Άλμπου_μ"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Καμία εκ των προτέρων λίστα αναπαραγωγής"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Διακοπή στο τέλους του κομματιού."
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Πληροφορίες τραγουδιού ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Μετάβαση σε χρόνο ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Μετάβαση στο Τραγούδι ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Ορισμός Επαναληψης του σημείου Α"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Ορισμός Επαναληψης του σημείου Β"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Απαλοιφή Επανάληψης Σημείων"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Κατά _Τίτλο"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Απο ονόμα του αρχείου"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Απο διαδρομή αρχείου"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Κατά Αριθμό_Κομματιού:"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Κατά _Καλλιτέχνη"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Από άλμπουμ"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Απο καλλιτέχνη άλμπουμ"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Κατά Ημερομηνία_Έκδοσης"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Από είδος μουσικής"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Από μήκος"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Κατά _Διαδρομή Αρχείου"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Κατά _Προσαρμοσμένο Τίτλο"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Α_ντίστροφη Σειρά"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Τυχαία Σειρά"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Αναπαραγωγή/Συνέχεια"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Ανανέωση"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ταξινόμηση"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Ταξινόμηση Επιλεγμένων"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Αφαίρεση Διπλών"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Αφαίρεση Μη Διαθέσιμων Αρχείων"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Νέο"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Μετ_ονομασία ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Αφαίρεση"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Εισαγωγή..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Εξαγωγή..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Διαχειριστής Λιστών _Αναπαραγωγής ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Διαχειριστής Ουράς Αναμονής ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Αύξηση_Έντασης"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Μείωση_Έντασης"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Ισοσταθμιστής ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Ε_φέ ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "Καταγραφή Ροής"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Ρυθμί_σεις Ήχου ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Εμφάνιση _Γραμμής Μενού"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Εμφάνιση Π_λαισίου Πληροφοριών"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Εμφάνιση Απεικόνισης Πλαισίου Πλη_ροφοριών"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Εμφάνιση _Γραμμής Κατάστασης"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Εμφάνιση χρόνου που απομένει"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Απεικονίσεις ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Αναπαραγωγή"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Λίστα αναπαραγωγής"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Υπηρεσίες"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Έξοδος"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Προβολή"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Εισαγωγή/Αφαίρεση στην/από την Ουρά"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Ανοιγμα φάκελου που περιέχετε"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Αποκο_πή"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Αντιγραφή"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Επικόλληση"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Επιλογή _Όλων"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Μετονομασία..."
 
@@ -1996,58 +2069,57 @@ msgstr "Πλήκτρα βέλους επιδιωξη από:"
 msgid "Scroll on song change"
 msgstr "Κύλιση στην αλλαγή τραγουδιού "
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Διεπαφή GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Γέμισμα ενδιάμεσης μνήμης..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "μονοφωνικό"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "στερεοφωνικό"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d κανάλι"
 msgstr[1] "%d κανάλια"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Ενιαία λειτουργία."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Λειτουργία λίστας αναπαραγωγής."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Διακοπή στο τέλους του κομματιού."
 
@@ -2055,9 +2127,9 @@ msgstr "Διακοπή στο τέλους του κομματιού."
 msgid "Previous track"
 msgstr "Προηγούμενο Κομμάτι"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
@@ -2065,8 +2137,8 @@ msgstr "Αναπαραγωγή"
 msgid "Pause/Resume"
 msgstr "Παύση/Συνέχεια"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Διακοπή"
 
@@ -2164,7 +2236,7 @@ msgstr "<b>Πρόσδεση κλειδιου</b>"
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Συντομεύσεις"
 
@@ -2193,25 +2265,25 @@ msgstr ""
 "Jonathan Davis Α <davis@jdhouse.org>,\n"
 "Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Έξοδος JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Αυτόματη σύνδεση σε θύρες εξόδου"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Μόνο %d θύρες εξόδου JACK βρέθηκαν αλλά %d απαιτούνται."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Απέτυχε να συνδεθεί στην JACK θύρα %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2219,11 +2291,11 @@ msgstr ""
 "Το JACK υποστηρίζει μόνο κινητή υποδιαστολής ήχου. Πρέπει να αλλάξετε το "
 "βάθος bit εξόδου σε κινητή υποδιαστολή στις ρυθμίσεις του Audacity."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Απέτυχε η σύνδεση με το διακομιστή JACK; είναι σε λειτουργία;"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2328,48 +2400,48 @@ msgstr "Επανασύνδεση με εξυπηρετητή LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Αναμονή πριν την επανασύνδεση:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Πρόσθετο LyricsWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Δεν υπάρχουν διαθέσιμοι στίχοι"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Δεν είναι δυνατή η ανάκτηση του %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Δεν είναι δυνατή η ανάλυση του %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Αναζήτηση για στίχους ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Λείπουν μεταδεδομένα τραγουδιού"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Σύνδεση με lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "επεξεργασία στίχων ..."
 
@@ -2381,17 +2453,17 @@ msgstr "Λίστες Αναπαραγωγής M3U"
 msgid "Tact Generator"
 msgstr "Tact Generator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2546,15 +2618,15 @@ msgstr "Αυτές οι ρυθμίσεις θα τεθούν σε ισχύ ότ�
 msgid "MPG123 Plugin"
 msgstr "Πρόσθετο MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Προχωρημένη</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Χρήση ακριβή υπολογισμού μήκους (αργή)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Περιφερειακό"
 
@@ -2566,35 +2638,35 @@ msgstr "Εξυπηρετητής MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Πρόσθετο Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Σφάλμα ανάλυσης ανακατεύθυνσης"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Άγνωστο σφάλμα HTTP"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Άγνωστο σφάλμα URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Πάρα πολλές ανακατευθύνσεις"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Το Audacious δεν αναπαράγει."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Ειδοποιήσεις στην επιφάνεια εργασίας"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2632,15 +2704,15 @@ msgstr ""
 "μαζί με αυτό το πρόγραμμα. Εάν όχι, κοιταξτε εδω <http://www.gnu.org/"
 "licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Εμφάνιση ελέγχου αναπαραγωγής"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Να εμφανίζεται πάντα κοινοποίηση"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Συμπερίληψη όνοματος του άλμπουμ στην κοινοποίηση"
 
@@ -2648,21 +2720,21 @@ msgstr "Συμπερίληψη όνοματος του άλμπουμ στην �
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Παύση"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Επόμενο"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Έξοδος OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Έξοδος OSS3"
 
@@ -2707,23 +2779,23 @@ msgstr ""
 "Vroon και John Lindgren και φυσικά τους δημιουργούς του προηγούμενου OSS "
 "πρόσθετου."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Διαχείριση Λίστας Τραγουδιών"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Καταχωρήσεις"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "Αφαίρεση"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Μετονομασία"
 
@@ -2735,51 +2807,34 @@ msgstr "Λίστες Αναπαραγωγής PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Αποκωδικοποιητής OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Έξοδος PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-"Αυτό το πρόγραμμα είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή / και "
-"τροποποίησή του υπό τους όρους της GNU General Public License όπως αυτή έχει "
-"δημοσιευθεί από το Ίδρυμα Ελεύθερου Λογισμικού είτε την έκδοση 2 της Άδειας, "
-"είτε (κατ 'επιλογή σας) οποιαδήποτε μεταγενέστερη έκδοση.\n"
-"\n"
-"Αυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο,\n"
-"αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ? χωρίς καν την υπονοούμενη εγγύηση της "
-"ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε το GNU "
-"General Public License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Άδειας Δημόσιας "
-"Χρήσης μαζί με αυτό το πρόγραμμα. Εάν όχι, γράψτε στο Ελεύθερο Λογισμικό "
-"Foundation, Inc., 51 Franklin Street, στον πέμπτο όροφο, Boston, MA "
-"02110-1301, ΗΠΑ."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Έξοδος QtMultimedia "
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2792,47 +2847,73 @@ msgstr ""
 "Με βάση το SDL Output Πρόσθετο για το Audacious\n"
 "Πνευματικά δικαιώματα 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Αναλυτής φάσματος για το Audacious\n"
+"Copyright 2013 Christophe Bude, Τζον Lindgren, και ο Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Με βάση το πρόσθετο XMMS:\n"
+"Πνευματικά δικαιώματα 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, και 4Front Technologies\n"
+"\n"
+"Άδεια: GPLv2 +"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Εργασία ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "Άνοιγμα Φακέλου ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "Προσθήκη Φακέλου ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Επιθεωρητής σύνδεσης ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Άνοιγμα αρχείων"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Προσθήκη αρχείων"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Επανάληψη"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Ανακάτεμα"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "Άνοιγμα Φακέλου ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "Προσθήκη Φακέλου ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Επιθεωρητής σύνδεσης ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Διεπαφή Qt"
 
@@ -2876,7 +2957,7 @@ msgstr "<b>Μετατροπή</b>"
 msgid "Method:"
 msgstr "Μέθοδος:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Ρυθμός:"
 
@@ -2928,67 +3009,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling για τους χρήστες: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Άρνηση Πρόσβασης"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Αποκτήσετε πρόσβαση στο παρακάτω σύνδεσμο για να επιτραπεί στο Audacious να "
-"Scrobble έργα σας:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Διατηρείστε αυτό το παράθυρο ανοικτό και κάντε κλικ στην επιλογή «Έλεγχος "
-"άδειας» και πάλι.\n"
-"\n"
-"\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Μην ανησυχείτε. Τα scrobbles σας αποθηκεύονται στον υπολογιστή σας. Οι "
-"προτάσεις θα υποβληθούν το συντομότερο στο Audacious για να το πράξει."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Πρόβλημα δικτύου."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"Υπήρξε ένα πρόβλημα κατά την επικοινωνία με το LastFM. Παρακαλώ δοκιμάστε "
-"ξανά αργότερα."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Γίνεται έλεγχος..."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Έλεγχος άδειας"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "Ανάκληση άδειας"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Θα πρέπει να επιτραπεί στο Audacious να Scrobble τραγουδια στον Last.fm "
-"λογαριασμό σας.\n"
-"\n"
-"\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3021,7 +3077,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3029,11 +3085,11 @@ msgstr ""
 "Το Audacious χρησιμοποιεί τώρα μια βελτιωμένη έκδοση του Last.fm Scrobbler. "
 "Παρακαλούμε ελέγξτε τις Προτιμήσεις για το πρόσθετο Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Έξοδος SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3041,58 +3097,58 @@ msgstr ""
 "Πρόσθετο Εξόδου SDL για το Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Βιβλιοθήκη"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d αποτελέσμα"
 msgstr[1] "%d αποτελέσματα"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d κρυφό)"
 msgstr[1] "(%d κρυφα)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d τραγούδι"
 msgstr[1] "%d τραγούδια"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "αυτού του είδους"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "σε"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "απο"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Δημιουργία Λίστας Αναπαραγωγής"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Προσθήκη στη Λίστα Αναπαραγωγής"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Αναζήτηση βιοθήκης"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3100,11 +3156,11 @@ msgstr ""
 "Για να εισάγεται τη συλλογή μουσικής σας στο Audacious, διαλέξτε έναν φάκελο "
 "και κάνετε κλικ στο εικονίδιο «ανανέωση»."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Παρακαλώ περιμένετε ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Επιλογή Φακέλου"
 
@@ -3200,15 +3256,15 @@ msgstr "Όριο:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Επανάληψη σημείων εκκαθαρισης."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Επαναληψη του σημείου Α"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Επαναληψη του σημείου Β"
 
@@ -3260,373 +3316,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ισοσταθμιστής Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Αναζητηση σε %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Ένταση: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Ισορροπία: %d%% αριστερά"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Ισορροπία: κέντρο"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Ισορροπία: %d%% δεξιά"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Μενού Επιλογών"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Απενεργοποίηση του 'Πάντα στην κορυφή'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Ενεργοποίηση του 'Πάντα στην κορυφή'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Πλαίσιο αρχείου πληροφοριών "
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Διπλό Μέγεθος"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Οπτικοποιησεις"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Καταγραφή ανενεργή"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Καταγραφή ενεργή"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Αύξηση Έντασης"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Μείωση Έντασης"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Εφέ ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Καταγραφή Ροής"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Ρυθμίσεις Ήχου ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Άνοιγμα Aρχείων ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Άνοιγμα διεύθυνσης URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Αναζήτηση Βιβλιοθήκης"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Λίστα Αναπαραγωγής"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Έξοδος"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Προβολή"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Σχετικά με ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Ρυθμίσεις ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Πληροφορίες τραγουδιού"
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Ανακάτεμα ανά Άλμπουμ"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Καμία εκ των προτέρων λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Διακοπή στο τέλους του κομματιού."
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Ορισμός A-B Επαναληψης "
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Απαλοιφή A-B Επανάληψης"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Μετάβαση στο Τραγούδι"
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Μετάβαση σε χρόνο ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Αναπαραγωγή/Συνέχεια"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Νέα Λίστα Αναπαραγωγής"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Μετονομασία λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Αφαίρεση λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Προηγούμενη λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Επόμενη Λίστα Αναπαραγωγής"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Εισαγωγή λίστας αναπαραγωγής ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Εξαγωγή λίστας αναπαραγωγής ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Διαχειριστής Λιστών Αναπαραγωγής ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Διαχειριστής Ουράς Αναμονής ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Ανανέωση λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Εμφάνιση Επιμέλειας αναπαραγωγής"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Εμφάνιση Ισοσταθμιστή"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Εμφάνιση χρόνου που απομένει"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Πάντα στην κορυφή"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Σε όλους τους χώρους εργασίας"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Roll Up Player"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Roll Up Επιμέλεια αναπαραγωγής"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Roll Up Ισοσταθμιστής"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Προσθήκη Διεύθυνσης URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Προσθήκη Αρχείων..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Κατά Τίτλο"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Από Όνομα Αρχείου"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Από διαδρομή αρχείου"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Αφαίρεση Όλων"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Εκκαθάριση Ουράς"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Αφαίρεση Μη Διαθέσιμων Αρχείων"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Αφαίρεση Διπλών"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Αφαίρεση Μη Επιλεγμένων"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Αφαίρεση Επιλεγμένων"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Αναζήτηση και Επιλογή"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Αντιστροφή Επιλογής"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Επιλογή Κανενός"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Κατά Αριθμό Κομματιού:"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Κατά Καλλιτέχνη"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Κατά Δίσκο"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Από Καλλιτέχνη άλμπουμ"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Από Ημερομηνία κυκλοφορίας"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Από Είδος"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Από Διάρκεια"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Από Προσαρμοσμένο τίτλο"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Τυχαιοποίηση Λίστας"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Αντίστροφη Λίστας"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ταξινόμηση Επιλεγμένων"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ταξινόμηση Λίστας"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Προσθήκη/Αφαίρεση από Ουρά"
 
@@ -3639,15 +3703,15 @@ msgstr "Επεξεργαστής Λίστα Αναπαραγωγής Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d από %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Κλασσική Διεπαφή Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Άνοιγμα Φακέλου ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Προσθήκη Φακέλου ..."
 
@@ -3735,7 +3799,7 @@ msgid "Slow"
 msgstr "Αργό"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Μεσαίο"
 
@@ -3871,7 +3935,7 @@ msgstr "Δημιουργία νέας λίστας αναπαραγωγής με
 msgid "Sndfile Plugin"
 msgstr "Πρόσθετο Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3912,62 +3976,62 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, στον πέμπτο όροφο, Boston, MA "
 "02110-1301, ΗΠΑ."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Έξοδος Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Συσκευή (κενό ως προεπιλογή):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Αποθήκευση και επαναφορά του ήχου:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio σφάλμα: Μη υποστηριζόμενη μορφή ήχου (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio σφάλμα: sio_open() απέτυχε"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio σφάλμα: sio_setpar() απέτυχε"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio σφάλμα: session_start() απέτυχε"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Αλλαγή Τραγουδιού"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Εντολές</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Εντολή για εκτέλεση όταν αρχίζει νέο τραγούδι:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Εντολή για εκτέλεση πλησιάζωντας το τέλος ενός τραγουδιού:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Εντολή για εκτέλεση στο τέλος της λίστας αναπαραγωγής."
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Εντολή για εκτέλεση όταν αλλαζει ο τίτλος του τραγουδιού (για ροές στο "
 "διαδίκτυο)."
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3976,7 +4040,7 @@ msgstr ""
 "θα αντικατασταθούν πριν την εκτέλεση της εντολής (δεν χρησιμεύουν όλοι στην "
 "εντολή τέλους-λίστας):???"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -4002,7 +4066,7 @@ msgstr ""
 "%t: Θέση στη Λίστα Αναπαραγωγής\n"
 "%T: Τίτλος (μη μορφοποιημένος)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4011,15 +4075,15 @@ msgstr ""
 "εισαγωγικά. Παράμετροι χωρίς εισαγωγικά μπορεί να οδηγήσουν σε αναπάντεχα "
 "αποτελέσματα. "
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Πληροφορίες Τραγουδιού"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Ανασχεδίαση"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4033,43 +4097,43 @@ msgstr ""
 "Με βάση την Sample Rate Converter Πρόσθετο:\n"
 "Πνευματικά δικαιώματα 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Γρήγορα"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Χαμηλα"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Υψηλα"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Πολύ υψηλα"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Ταχύτητα και Χροιά:"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Ταχύτητα και Χροιά</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Ταχύτητα:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Χροιά:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Εικονίδιο κατάστασης"
 
@@ -4173,12 +4237,12 @@ msgstr "<b>Επιπλέον Στερεοφωνικό</b>"
 msgid "Tone Generator"
 msgstr "Γεννήτρια Τόνων"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Γεννήτρια Τόνων: "
 
@@ -4200,7 +4264,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Αφαίρεση Φωνής"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4276,7 +4340,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Αποκωδικοποιητής VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4286,19 +4350,29 @@ msgstr ""
 "Βασισμένο στο in_vtx.dll του Roman Sherbakov <v_soft@microfor.ru>\n"
 "Πρόσθετο για το Audacious από τον Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Αποκωδικοποιητής WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "με απώλεια (υβριδικός)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "με απώλεια"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4312,32 +4386,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Αποκωδικοποιητής 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF Ρύθμιση</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Παράβλεψη μήκους από το αρχείο"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Διαμοιραζόμενες Λίστες Αναπαραγωγής ΧΜL (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Το σταδιακό σβήσιμο απέτυχε επειδή τα τραγούδια είχαν διαφορετικό αριθμό "
-#~ "καναλιών. Μπορείτε να χρησιμοποιήσετε το μίξερ καναλιού για να "
-#~ "μετατρέψετε τα τραγούδια στον ίδιο αριθμό καναλιών."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Το σταδιακό σβήσιμο απέτυχε επειδή τα τραγούδια έχουν διαφορετικούς "
-#~ "ρυθμούς δειγματοληψίας. Μπορείτε να χρησιμοποιήσετε το Sample Rate "
-#~ "Converter για να μετατρέψετε τα τραγούδια στον ίδιο ρυθμό δειγματοληψίας."
diff --git a/po/en_GB.po b/po/en_GB.po
index da67834..3cc7a8f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Andi Chandler <andi@gowling.com>, 2013
+# Andi Chandler <andi@gowling.com>, 2013,2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/jlindgren/"
 "audacious/language/en_GB/)\n"
@@ -19,35 +19,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "AAC (Raw) Decoder"
 
 #: src/adplug/adplug-xmms.cc:42
 msgid "AdPlug (AdLib Player)"
-msgstr ""
+msgstr "AdPlug (AdLib Player)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
-msgstr ""
+msgstr "sequenced"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
-msgstr ""
+msgstr "Set Alarm ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -98,149 +101,149 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "This is your wakeup call."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
-msgstr ""
+msgstr "Your reminder for today is..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Reminder"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Monday"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Thursday"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Friday"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Saturday"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Sunday"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Time"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarm at (default):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Quiet after:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "hours"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutes"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Choose the days for the alarm to come on"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Day"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Default"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Days"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Fading"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "seconds"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Start at"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Current"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Additional Command"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "enable"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Playlist (optional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
-msgstr ""
+msgstr "Select a playlist"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Options"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "What do these options mean?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Help"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
-msgstr ""
+msgstr "Album Art"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr ""
+msgstr "ALSA Output"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -253,7 +256,7 @@ msgstr ""
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(no description)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -275,11 +278,11 @@ msgstr "Mixer device:"
 msgid "Mixer element:"
 msgstr "Mixer element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "AMIDI-Plug (MIDI Player)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -302,68 +305,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Override default gain:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Override default polyphony:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Override default reverb:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Override default chorus:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
-msgstr ""
+msgstr "<b>Playback</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transpose:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
-msgstr ""
+msgstr "semitones"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Drum shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "note numbers"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Skip leading silence"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
-msgstr ""
+msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
-msgstr ""
+msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
-msgstr ""
+msgstr "Sample rate:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -371,86 +374,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - select SoundFont file"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "File name"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Size (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Name:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Length (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "No. of Tracks:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* no comments available in this MIDI file *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no lyrics available in this MIDI file *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Close"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (invalid UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -461,10 +478,17 @@ msgid ""
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -496,7 +520,7 @@ msgstr "Title Change"
 
 #: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Triggers OSD when the song title changes (for Internet streams)."
 
 #: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
@@ -514,94 +538,94 @@ msgstr "Pause Off"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Triggers OSD when playback is unpaused."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Placement"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relative X offset:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relative Y offset:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Max OSD width:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Multi-Monitor options"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Display OSD using:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "all monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Display:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Fade in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Fade out:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Shadow"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Render Style"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colours"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Colour %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Enable trigger"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Event"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Composite manager detected"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -611,112 +635,108 @@ msgstr ""
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD will not work properly"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite manager not required for fake transparency"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparency"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Fake transparency"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Real transparency (requires X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite extension not loaded"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite extension not available"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Trigger"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "ASXv3 Playlists"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "ASXv1/ASXv2 Playlists"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr ""
+msgstr "Audacious Playlists (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
-msgstr ""
+msgstr "<b>Colour</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
-msgstr ""
+msgstr "Blur Scope"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Presets:"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Feed level:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Cut frequency:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "Spectrum Analyser"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -727,125 +747,133 @@ msgid ""
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
-msgstr ""
+msgstr "<b>Device</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
-msgstr ""
+msgstr "Read speed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
-msgstr ""
+msgstr "Override device:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
-msgstr ""
+msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
-msgstr ""
+msgstr "Use CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
-msgstr ""
+msgstr "Use CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Use HTTP instead of CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
-msgstr ""
+msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
-msgstr ""
+msgstr "Path:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Failed to initialise cdio subsystem."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "Invalid URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Track %d not found."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Track %d is a data track."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Error reading audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Failed to open CD device %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "No audio capable CD drive found."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Failed to finish initialising opened CD drive."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Failed to retrieve first/last track number."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Cannot read start/end LSN for track %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "Failed to create the CDDB connection."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Failed to query the CDDB server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Failed to query the CDDB server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "Failed to read the CDDB info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Drive is empty."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Unsupported disk type."
 
 #: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Audio CD Menu Items"
 
 #: src/cd-menu-items/cd-menu-items.cc:45
 msgid "Play CD"
@@ -857,7 +885,7 @@ msgstr "Add CD"
 
 #: src/compressor/compressor.cc:45
 msgid "<b>Compression</b>"
-msgstr ""
+msgstr "<b>Compression</b>"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
@@ -872,10 +900,12 @@ msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dynamic Range Compressor"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -886,6 +916,12 @@ msgid ""
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -992,58 +1028,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1081,11 +1119,11 @@ msgstr ""
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1095,15 +1133,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Pick a folder"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1120,194 +1154,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Output file format:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Save into original directory"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "General"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algorithm Quality:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Compression ratio:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audio Mode:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Error protection"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Quality"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Enable VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR Options:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR Options:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Average bitrate (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR quality level:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Strictly enforce minimum bitrate"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Mark as copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Mark as original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Force addition of version 2 tag"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Only add v1 tag"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Only add v2 tag"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Quality"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Quality level (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1315,25 +1433,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1345,23 +1463,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1378,8 +1483,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Entry number"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Title"
@@ -1436,8 +1541,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr ""
 
@@ -1465,335 +1570,338 @@ msgstr "Undock"
 msgid "Disable"
 msgstr "Disable"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Open Files ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Open _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Add U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "A_bout ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Quit"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Play"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Pre_vious"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Next"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Repeat"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "S_huffle"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_o Playlist Advance"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Song _Info ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Jump to _Time ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Jump to Song ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "By _Title"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "By Track _Number"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "By _Artist"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "By Release _Date"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "By _File Path"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "By _Custom Title"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "R_everse Order"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Random Order"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Refresh"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sort"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_New"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Import ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Export ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Queue Manager ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Volume _Up"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Volume _Down"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Show I_nfo Bar"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_File"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Playback"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "P_laylist"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Services"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Output"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_View"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Queue/Unqueue"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copy"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Paste"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Select _All"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr ""
 
@@ -1834,58 +1942,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Single mode."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Playlist mode."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Stopping after song."
 
@@ -1893,9 +2000,9 @@ msgstr "Stopping after song."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Play"
 
@@ -1903,8 +2010,8 @@ msgstr "Play"
 msgid "Pause/Resume"
 msgstr "Pause/Resume"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stop"
 
@@ -2004,7 +2111,7 @@ msgstr "<b>Key Binding:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2023,35 +2130,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2137,48 +2244,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Error"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2190,17 +2297,17 @@ msgstr ""
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2348,15 +2455,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2368,35 +2475,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Stopped"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious is not playing."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2416,15 +2523,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2432,21 +2539,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2483,23 +2590,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2511,35 +2618,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2548,47 +2654,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr ""
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repeat"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Shuffle"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2630,7 +2753,7 @@ msgstr ""
 msgid "Method:"
 msgstr "Method:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2682,52 +2805,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2751,84 +2863,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr ""
 
@@ -2922,15 +3034,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2982,373 +3094,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equaliser"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Seek to %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% left"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: centre"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% right"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Options Menu"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Disable 'Always On Top'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Enable 'Always On Top'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "File Info Box"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Playback"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr ""
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "No Playlist Advance"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Show Playlist Editor"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Show Equaliser"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr ""
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr ""
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr ""
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr ""
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr ""
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr ""
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr ""
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr ""
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3361,15 +3481,15 @@ msgstr ""
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3457,7 +3577,7 @@ msgid "Slow"
 msgstr ""
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr ""
 
@@ -3589,7 +3709,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3611,66 +3731,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3685,21 +3805,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3708,43 +3828,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr ""
 
@@ -3830,12 +3950,12 @@ msgstr ""
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3852,7 +3972,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3901,26 +4021,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3931,14 +4061,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 18307b3..d48a5d9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,9 @@
 # Translators:
 # Adolfo Jayme Barrientos, 2013
 # Adolfo Jayme Barrientos <fito@libreoffice.org>, 2013-2014
-# Adolfo Jayme Barrientos, 2013
-# Adolfo Jayme Barrientos, 2015
+# Adolfo Jayme-Barrientos, 2013
+# Adolfo Jayme-Barrientos, 2016
+# Adolfo Jayme-Barrientos, 2015
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
 # Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
 # enjolras <yo@miguelrevilla.com>, 2012
@@ -24,10 +25,10 @@
 # enjolras <yo@miguelrevilla.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Spanish (http://www.transifex.com/jlindgren/audacious/"
 "language/es/)\n"
@@ -37,7 +38,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Descodificador ACC (sin procesar)"
 
@@ -45,20 +46,20 @@ msgstr "Descodificador ACC (sin procesar)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "secuenciado"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Establecer alarma…"
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -68,7 +69,7 @@ msgstr ""
 "\n"
 "Escrito originalmente por Adam Feakin y Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -119,147 +120,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Este es el aviso de su alarma."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Tu recordatorio para hoy es..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma a (predeterminado):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silencio tras:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Seleccione los días para que salte la alarma"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Día"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Transición"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Iniciar a"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de reproducción (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Seleccione una lista de reproducción"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "¿Qué significan estas opciones?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Carátula del álbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -302,11 +303,11 @@ msgstr "Dispositivo mezclador:"
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -348,68 +349,68 @@ msgstr ""
 "a Tony Vroon\n"
 "por su inestimable ayuda probando la alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Ignorar ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Ignorar polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Ignorar reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Activado"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Ignorar coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reproducción</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponer:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitonos"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Omitir silencio del principio"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Omitir silencio del final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetizador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Frecuencia de muestreo:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -417,86 +418,100 @@ msgstr "Frecuencia de muestreo:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Información MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Núm. de pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Comentarios y letras MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 no válido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -515,7 +530,7 @@ msgstr ""
 "Basado parcialmente en la librería ghosd de Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (información en pantalla)"
 
@@ -569,94 +584,94 @@ msgstr "Fin de la pausa"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Avisa cuando se reanuda la reproducción."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Ubicación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Desplazamiento horizontal relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Desplazamiento vertical relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Anchura máxima:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opciones multimonitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Mostrar notificaciones utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Tiempo (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Aparición suave:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Desvanecimiento suave:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Tipografía %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo de renderizado"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Gestor de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -666,61 +681,57 @@ msgstr ""
 "por favor, a no ser que esté seguro de que ya hay uno ejecutándose, active "
 "un gestor de composición, o las notificaciones no funcionarán correctamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "No se necesita un gestor de composición para producir seudotransparencias"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Seudotransparencia"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia (requiere extensión de composición)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Notificaciones de Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Varios"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Probar"
 
@@ -736,11 +747,11 @@ msgstr "Listas de reproducción ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción de Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Color</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Borroso"
 
@@ -764,15 +775,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frecuencia de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Complemento de Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -793,118 +804,118 @@ msgstr ""
 "\n"
 "Este fue un proyecto del «Google Summer of Code» de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Reemplazar dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadatos</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usar HTTP en lugar de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Dirección:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "No se pudo iniciar el subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s no válido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Error al leer el CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "No se pudo abrir el dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "No se encontró ningún lector compatible con CDs de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Ocurrió un error tratando de iniciar el lector de CDs."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "No se pudo recuperar el número de la primera/última pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer el LSN de inicio/fin de la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Error de establecimiento de conexión con el servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Error de consulta al servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Error de consulta al servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Error de lectura de información de la CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
@@ -1074,58 +1085,60 @@ msgstr "Intensidad:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Complemento «Hojas cue»"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Borrar archivos"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Error moviendo %s a la papelera: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Error borrando %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Error borrando %s: no es un archivo local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "¿Quiere mover los archivos seleccionados a la papelera?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Mover a la papelera"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "¿Quiere borrar de forma permanente los archivos seleccionados?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Borrar archivos seleccionados"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Método de borrado</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover a la papelera en vez de borrar inmediatamente"
 
@@ -1167,11 +1180,11 @@ msgstr "Volumen:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Complemento de FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1187,15 +1200,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Escribir archivo"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Elija una carpeta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1212,194 +1221,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
-msgstr ""
+msgstr "Guardar en carpeta personalizada:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Generar nombre a partir de:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nombre del archivo original"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
-msgstr ""
+msgstr "Nombre de archivo original (sin sufijo)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta del archivo original"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Anteponer el nº de pista al nombre del archivo"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "General"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11 025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12 000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16 000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22 050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24 000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32 000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44 100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48 000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kb/s"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kb/s"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kb/s"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kb/s"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kb/s"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kb/s"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kb/s"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kb/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kb/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kb/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kb/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kb/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kb/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kb/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kb/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kb/s"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Calidad del algoritmo:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Frecuencia de muestreo:"
-
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tasa de bits / Relación de compresión"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Calidad del algoritmo:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Índice de compresión:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Modo de audio:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Miscelánea:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Forzar conformidad con normas ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Tas de bits mínima:"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicación estricta de la tasa de bits mínima"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Tasa de bits máxima:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Tasa de bits promedio:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Tasa media de bits (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicación estricta de la tasa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omitir cabecera VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parámetros de trama:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Protegido por derechos de autor"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Etiquetas ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forzar uso de etiquetas de la versión 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Solo usar ID3v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Solo usar ID3v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Calidad (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1411,7 +1504,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1419,19 +1512,19 @@ msgstr ""
 "Complemento GIO para Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Complemento GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo leer-y-agregar no soportado"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo de acceso a ficheros no válido"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1451,32 +1544,10 @@ msgstr ""
 "\n"
 "Licencia: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analizador de espectro OpenGL para Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basado en el complemento para XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
-"4Front Technologies\n"
-"\n"
-"Licencia: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Atajos de teclado GNOME"
@@ -1497,8 +1568,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1555,8 +1626,8 @@ msgstr "Columnas disponibles"
 msgid "Displayed columns"
 msgstr "Columnas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
@@ -1584,335 +1655,338 @@ msgstr "Desacoplar"
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Aña_dir archivos ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Explorar _biblioteca"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Preferencias ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Pausar"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Dete_ner después de esta canción"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Ir al _momento ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Ir a la _canción ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Crear bucle (punto _A)"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Crear bucle (punto _B)"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "Borrar b_ucle"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Por _nombre de archivo"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Por _número de pista"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Por artista del álbu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Por _fecha de lanzamiento"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Por _género"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Por _duración"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Reproducir/Continuar"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Ordenar _seleccionados"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Eliminar _duplicados"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_Eliminar archivos no disponibles"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Reno_mbrar …"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Borrar"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "E_xportar ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Gestor de listas de reproducción …"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Gestor de _cola ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fectos ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar barra de información de vis_ualización"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostrar _tiempo restante"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "Visualizaciones ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_A_gregar/Quitar de la cola"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "A_brir carpeta contenedora"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "C_ortar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
@@ -1953,58 +2027,57 @@ msgstr "Las teclas de dirección (flechas) dan saltos de:"
 msgid "Scroll on song change"
 msgstr "Desplazar al cambiar de canción"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
-msgstr ""
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
@@ -2012,9 +2085,9 @@ msgstr "Parar después de la canción."
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproducir"
 
@@ -2022,8 +2095,8 @@ msgstr "Reproducir"
 msgid "Pause/Resume"
 msgstr "Pausa/Continuar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Detener"
 
@@ -2123,7 +2196,7 @@ msgstr "<b>Teclas asociadas:</b>"
 msgid "_Add"
 msgstr "_Añadir"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Atajos de teclado globales"
 
@@ -2154,25 +2227,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Conectar automáticamente a los puertos de salida"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Sólo se encontraron %d puertos de salida JACK, pero se necesitan %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Error de conexión al puerto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2180,11 +2253,11 @@ msgstr ""
 "JACK sólo soporta audio en coma flotante . Debe cambiar a «Coma flotante» la "
 "opción «Profundidad de bits» en los ajustes de salida de sonido."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Error de conexión al servidor JACK. ¿Está ejecutándose?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2289,50 +2362,50 @@ msgstr "Volver a conectar con el servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Espera antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Complemento de LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "No hay letras disponibles."
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Error"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "No se pudo obtener %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "No se pudo interpretar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Metadatos de canción ausentes"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando con lyrics.wikia.com…"
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
-msgstr ""
+msgstr "Editar letra…"
 
 #: src/m3u/m3u.cc:32
 msgid "M3U Playlists"
@@ -2342,17 +2415,17 @@ msgstr "Listas de reproducción M3U"
 msgid "Tact Generator"
 msgstr "Marcador de compás"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Marcador de compás: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Marcador de compás: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2510,15 +2583,15 @@ msgstr "Estos ajustes tendrán efecto cuando se reinicie Audacious."
 msgid "MPG123 Plugin"
 msgstr "Complemento MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avanzado</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Cálculo preciso de duración (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2530,35 +2603,35 @@ msgstr "Servidor MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Complemento Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Error procesando redirección"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Error HTTP desconocido"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Error procesando URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Demasiadas redirecciones"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones de escritorio"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2594,15 +2667,15 @@ msgstr ""
 "Debería haber recibido una copia de la Licencia Pública General GNU junto a "
 "este programa. En caso contrario, consulte <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Mostrar controles de reproductor"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Mantener siempre visible"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Incluir nombre del álbum"
 
@@ -2610,21 +2683,21 @@ msgstr "Incluir nombre del álbum"
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Salida OSS3"
 
@@ -2667,23 +2740,23 @@ msgstr ""
 "especialmente a Tony Vroon y John Lindgren, y, por supuesto, a los autores "
 "del anterior complemento OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gestor de listas de reproducción"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Pistas"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Borrar"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Renombrar"
 
@@ -2695,52 +2768,34 @@ msgstr "Listas de reproducción PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Salida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Complemento «Salida PulseAudio» para Audacious\n"
-"\n"
-"Este programa es software libre: usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia Pública General GNU, publicada por la\n"
-"«Free Software Foundation» (Fundación para el software libre), ya sea la\n"
-" versión 2 de la Licencia, o (a su elección) cualquier versión posterior.\n"
-"\n"
-"Este programa se distribuye con la esperanza de que sea útil,\n"
-"pero SIN GARANTÍA ALGUNA; ni siquiera la garantía implícita de\n"
-"COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO DETERMINADO.\n"
-"Consulte los detalles de la Licencia Pública General GNU para obtener\n"
-"una información más detallada.\n"
-"\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU\n"
-"junto a este programa. En caso contrario, escriba a Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Salida QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2754,47 +2809,73 @@ msgstr ""
 "Basado en el complemento «Salida SDL» para Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizador de espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Basado en el complemento para XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
+"4Front Technologies\n"
+"\n"
+"Licencia: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Trabajando ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Buscar"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "A_brir carpeta"
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "Añadi_r carpeta"
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Inspector de registro..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Abrir archivos"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Añadir archivos"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Orden aleatorio"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "A_brir carpeta"
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "Añadi_r carpeta"
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Inspector de registro..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interfaz Qt"
 
@@ -2838,7 +2919,7 @@ msgstr "<b>Conversión</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Tasa:"
 
@@ -2890,61 +2971,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Aprobado. Scrobbling para usario: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso denegado"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Acceda a esta página para permitir scrobbling en Audacious:"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
-"Mantenga esta ventana abierta y haga clic en «Comprobar el permiso» otra "
-"vez.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"No se preocupe: sus scrobbles se guardan en su equipo.\n"
-"Se enviarán tan pronto como Audacious reciba la autorización necesaria."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema de la red"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Hubo un problema al contactar con Last.fm. Por favor inténtelo de nuevo más "
-"tarde."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Comprobando..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_omprobar el permiso"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "Revocar el permiso"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Necesita autorizar a Audacious para hacer scrobbling a su cuenta de Last."
-"fm.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2976,7 +3038,7 @@ msgstr ""
 "proyecto.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2984,11 +3046,11 @@ msgstr ""
 "Audacious usa ahora una versión mejorada del Scrobbler de Last.fm.\n"
 "Busque «Scrobbler» en la sección de «Complementos» de las «Preferencias»."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2996,58 +3058,58 @@ msgstr ""
 "Complemento «Salida SDL» para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d oculto)"
 msgstr[1] "(%d ocultos)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d canción"
 msgstr[1] "%d canciones"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "de este género"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "en"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "por"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Crear lista de reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Añadir a la lista de reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Explorar biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3055,11 +3117,11 @@ msgstr ""
 "Para importar su biblioteca musical en Audacious, seleccione una carpeta y "
 "pulse el botón «Actualizar»."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Espere por favor..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Seleccione un directorio"
 
@@ -3155,15 +3217,15 @@ msgstr "Umbral:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Borrar bucle."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Punto A del bucle."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Punto B del bucle."
 
@@ -3215,373 +3277,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ecualizador de Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: centrado"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Activar 'Siempre encima'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caja de información de archivo"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Duplicar tamaño"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualizaciones"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
-msgstr ""
+msgstr "Grabación activada"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
-msgstr ""
+msgstr "Grabación desactivada"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
-msgstr ""
+msgstr "Subir el volumen"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
-msgstr ""
+msgstr "Bajar el volumen"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
-msgstr ""
+msgstr "Efectos…"
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
-msgstr ""
+msgstr "Grabar la transmisión"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
-msgstr ""
+msgstr "Configuración de audio…"
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Abrir archivos ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Abrir URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Explorar biblioteca"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
-msgstr ""
+msgstr "Salida"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servicios"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Acerca de ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Preferencias ... "
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Salir"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Información de la canción ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
-msgstr ""
+msgstr "Mezclar por álbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Detener después de esta canción"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Crear bucle (puntos A-B)"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Borrar bucle"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Ir a la canción ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Ir al momento ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Reproducir/Continuar"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Renombrar lista ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Borrar lista ..."
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Lista anterior"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Lista siguiente"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importar lista ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportar lista ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Gestor de listas ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Gestor de cola ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Actualizar lista de reproducción"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Mostrar tiempo restante"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "En todas las áreas de trabajo "
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Enrollar reproductor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Enrollar editor de lista de reproducción"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Enrollar ecualizador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Añadir URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Añadir archivos ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Por nombre de archivo"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Por ruta de archivo"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Limpiar la cola"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Eliminar los no seleccionados"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Eliminar los seleccionados"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Por artista del álbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Por fecha de lanzamiento"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Por género"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Por duración"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordenar los seleccionados"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Abrir la carpeta contenedora"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Pegar al final"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Agregar/Quitar de la cola"
 
@@ -3594,17 +3664,17 @@ msgstr "Editor de listas de reproducción de Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interfaz clásica de Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
-msgstr ""
+msgstr "Abrir una carpeta…"
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
-msgstr ""
+msgstr "Añadir una carpeta…"
 
 #: src/skins-qt/skins_cfg.cc:197 src/skins/skins_cfg.cc:181
 msgid "Player:"
@@ -3690,7 +3760,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Medio"
 
@@ -3825,7 +3895,7 @@ msgstr "Crear una nueva lista de reproducción con las coincidencias"
 msgid "Sndfile Plugin"
 msgstr "Complemento Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3865,68 +3935,68 @@ msgstr ""
 "este programa. En caso contrario, escriba a Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Salida Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (en blanco por defecto):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Guardar y restaurar volumen:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Error de sndio: formato de audio (%d) no soportado"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Error de sndio: sio_open() falló"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Error de sndio: sio_setpar() falló"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Error de sndio: sio_start() falló"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Comandos</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Comando a ejecutar al empezar una nueva canción:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Comando a ejecutar al acabar una canción:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando a ejecutar al concluir la lista de reproducción:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando a ejecutar cuando el título de la canción cambie (para flujos de "
 "red):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3941,21 +4011,23 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
+"Los parámetros que se envíen a la consola deberían entrecomillarse; de lo "
+"contrario, los resultados podrían no ser los esperados."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
-msgstr ""
+msgstr "Información de la canción"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Remuestreador SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3969,43 +4041,43 @@ msgstr ""
 "Basado en el complemento «Convertidor de frecuencia de muestreo»:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Bajo"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Muy Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Calidad"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidad y tono</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tono:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icono de estado"
 
@@ -4101,12 +4173,12 @@ msgstr "<b>Extra estéreo</b>"
 msgid "Tone Generator"
 msgstr "Generador de tonos"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
@@ -4129,7 +4201,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Eliminación de voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4206,7 +4278,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4216,19 +4288,29 @@ msgstr ""
 "Basado en in_vtx.dll, creado por Roman Sherbakov <v_soft@microfor.ru>\n"
 "Complemento para Audacious escrito por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4242,14 +4324,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuración XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorar duración del archivo"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reproducción XML (XSPF)"
diff --git a/po/es_AR.po b/po/es_AR.po
index 2e13063..48ef4ca 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -9,10 +9,10 @@
 # xukosky <xukosky@yahoo.es>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/jlindgren/"
 "audacious/language/es_AR/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -30,20 +30,20 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "Escrito originalmente por Adam Feakin y Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -105,147 +105,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Esta es su llamada despertador"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma a (predeterminado):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silencio tras:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Seleccione los días para que salte la alarma"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Día"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Desvanecimiento"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Iniciar a"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de reproducción (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Elegir una lista de reproducción"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "¿Qué significan estas opciones?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Arte de tapa"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -288,11 +288,11 @@ msgstr "Dispositivo mezclador:"
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Plug-AMIDI (Reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -315,68 +315,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -384,86 +384,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Información MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Nro. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Comentarios y letras MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 no válido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -475,7 +489,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Visualización en pantalla)"
 
@@ -527,94 +541,94 @@ msgstr "Fin de pausa"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Avisa cuando la reproducción se reanuda."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Desplazamiento X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Desplazamiento Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Ancho máximo:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opciones multi-monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Mostrar notificaciones utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Desvanecimiento de entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Desvanecimiento de salida:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Tipografía %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo de renderizado"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Administrador de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -625,60 +639,56 @@ msgstr ""
 "administrador de composición o las notificaciones no funcionarán "
 "correctamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador de composición no necesario para transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere composición 3D)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Notificaciones de Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Varios"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -694,11 +704,11 @@ msgstr "Listas de reproducciónASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Color</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Niebla Borrosa"
 
@@ -722,15 +732,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -742,118 +752,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Leer velocidad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Anular dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadatos</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Usar CD-Texto"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usar HTTP en lugar de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Error en la inicialización del subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Error al abrir la lectora de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "No hay audio que se pueda reproducir en la lectora de CD localizada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Error al finalizar la lectora de CD inicializada oportunamente."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Error al obtener el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer el LSN del comienzo/final de la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Error al crear la conexión a cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Error al consultar el servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Error al consultar el servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Error al leer la información cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
@@ -1006,58 +1016,60 @@ msgstr "Intensidad:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Plugin para hoja cue"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1095,11 +1107,11 @@ msgstr "Volumen:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1109,15 +1121,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Elija una carpeta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1134,194 +1142,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "General"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Calidad del algoritmo:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Compresión:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Modo de sonido:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicar estrictamente la tasa de bits mínima"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Tasa de bits promedio (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estrictamente la tasa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marcar como derechos de autor"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiqueta de la versión 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Solo agregar etiqueta v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Solo agregar etiqueta v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1329,25 +1421,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1359,23 +1451,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1392,8 +1471,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1450,8 +1529,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
@@ -1479,335 +1558,338 @@ msgstr "Desacoplar"
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Añadir archivos ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Pa_usar"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Si_guiente"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Por _número de pista"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Eliminar archivos _no disponibles"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportar ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Administrador_de listas de reproducción ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Gestor de _colas ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar la Barra Informativa de Vis_ualización"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
@@ -1848,58 +1930,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
@@ -1907,9 +1988,9 @@ msgstr "Parar después de la canción."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproducir"
 
@@ -1917,8 +1998,8 @@ msgstr "Reproducir"
 msgid "Pause/Resume"
 msgstr "Pausa/continuar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Detener"
 
@@ -2017,7 +2098,7 @@ msgstr "<b>Teclas asociadas:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Teclas abreviadas globales"
 
@@ -2036,35 +2117,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2151,48 +2232,48 @@ msgstr "Reconectar a servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Espera antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "No se encontraron letras"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Error"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "No se puede obtener %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "No se puede analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras de la canción...."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "No hay metadatos de la canción"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectándose con lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2204,17 +2285,17 @@ msgstr "Listas de reproducción M3U"
 msgid "Tact Generator"
 msgstr "Generador de tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tacto: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2362,15 +2443,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Envolvente"
 
@@ -2382,35 +2463,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones de escritorio"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2430,15 +2511,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2446,21 +2527,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2497,23 +2578,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2525,35 +2606,34 @@ msgstr "Listas PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Abrir el decodificador PSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Salida de PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2562,47 +2642,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Orden aleatorio"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2644,7 +2741,7 @@ msgstr "<b>Conversión</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Velocidad:"
 
@@ -2696,52 +2793,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2765,74 +2851,74 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Crear lista de reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Añadir a la lista de reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Buscar biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2840,11 +2926,11 @@ msgstr ""
 "Para importar su colección musical en Audacious, elija una carpeta y pulse "
 "el botón «actualizar»."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Espere por favor..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Elija una carpeta"
 
@@ -2938,15 +3024,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2998,373 +3084,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ecualizador de Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: centrado"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Activar 'Siempre encima'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caja de información de archivo"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Limpiar la cola"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Eliminar los no seleccionados"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Eliminar los seleccionados"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordenar los seleccionados"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3377,15 +3471,15 @@ msgstr "Editor de listas de reproducción de Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface del Winamp Clásico"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3473,7 +3567,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Medio"
 
@@ -3609,7 +3703,7 @@ msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3631,66 +3725,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3705,21 +3799,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3728,43 +3822,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y amplitud"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidad y amplitud</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Amplitud:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icono de estado"
 
@@ -3850,12 +3944,12 @@ msgstr "<b>Extra Estéreo</b>"
 msgid "Tone Generator"
 msgstr "Generador de Tono"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
@@ -3872,7 +3966,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Quitar voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3921,26 +4015,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3951,14 +4055,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reproducción compartidas XML (XSPF)"
diff --git a/po/es_MX.po b/po/es_MX.po
index 5f68fa3..2027e8b 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -4,13 +4,13 @@
 #
 # Translators:
 # Jorge A. García Sosa <kamesennin555@icloud.com>, 2012-2014
-# Jorge A. García Sosa <kamesennin555@icloud.com>, 2014-2015
+# Jorge A. García Sosa <kamesennin555@icloud.com>, 2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-09-09 15:12+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-28 16:55+0000\n"
 "Last-Translator: Jorge A. García Sosa <kamesennin555@icloud.com>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/jlindgren/"
 "audacious/language/es_MX/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Decodificador AAC (RAW)"
 
@@ -28,20 +28,20 @@ msgstr "Decodificador AAC (RAW)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "secuencializado"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Programar Alarma ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -52,7 +52,7 @@ msgstr ""
 "\n"
 "Orignalmente escrito por Adam Feakin y Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -150,147 +150,147 @@ msgstr ""
 "    Escríbelo en el campo de entrada y habilita\n"
 "    la caja is quieres que se muestre."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Esta es tu llamada despertador."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Tu recordatorio para hoy es..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma a las (predeterminado):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silenciar después de:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Escoge los días para que suene la alarma"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Día"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Desvanecimiento"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Comenzar a"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Finalizar a"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando Adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "habilitar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de Reproducción (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Selecciona una lista de reproducción"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "¿Qué significan estás opciones?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Portada de Álbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -332,11 +332,11 @@ msgstr "Dispositivo mezclador:"
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -378,68 +378,68 @@ msgstr ""
 "Tony Vroon\n"
 "for the good help with alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Anular ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Anular polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Anular reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Encender"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Anular coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reproducir</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transportar:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitonos"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Saltar silencio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Saltar silencio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>SIntetizador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Tasa de bits:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -447,86 +447,106 @@ msgstr "Tasa de bits:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleccionar archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Información MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Duración (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Núm. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div. tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Comentarios y Letras de canción MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras de canción disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 inválido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Navegador Ampache\n"
+"\n"
+"Cliente Ampache para Audacious.\n"
+"\n"
+"Licencia: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský y John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -545,7 +565,7 @@ msgstr ""
 "Basado en parte en la librería Ghosd de Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Mensaje en Pantalla)"
 
@@ -599,94 +619,94 @@ msgstr "Pausa Apagada"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Muestra Notificación en Pantalla cuando la pausa termina."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Compensación relativa en X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Compensación relativa en Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Ancho máximo de OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opciones de varios monitores"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Mostrar OSD utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "Todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Tiempo (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Desvanecimiento al aparecer:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Desvanecimiento al desaparecer:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Fuente %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo de Renderización"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Activar Aviso"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Administrador de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -697,60 +717,56 @@ msgstr ""
 "administrador de composición, de otra forma las  Notificaciones en Pantalla "
 "no funcionarán apropiadamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador de composición no requerido para transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Avisos"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Misc."
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Probar"
 
@@ -766,11 +782,11 @@ msgstr "Listas de reproducción ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Color</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -794,15 +810,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frecuencia de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Plugin CD de Audio  "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -823,118 +839,118 @@ msgstr ""
 "\n"
 "Este fue un proyecto del Google Summer of Code 2007"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Reemplazar dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadatos</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Usar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP en vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Ruta de Acceso:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falla al iniciar el susbsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s no válido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Error al leer CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD de Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Fallo al abrir el dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "No se encontró drive de CD capaz de reproducir audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Fallo al terminar de preparar drive de CD  abierto."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Fallo al recuperar el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer LSN inicio/final para la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Fallo al crear la conexión cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Fallo al consultar el servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Fallo al consultar el servidor CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Fallo al leer la nformación cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "La unidad de disco está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
@@ -1104,58 +1120,60 @@ msgstr "Intensidad:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Borrar Archivos"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Error al mover %s a la bandeja: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Error al borrar %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Error mientras borraba %s: no es un archivo local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "¿Quieres mover los archivos seleccionados a la bandeja?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Mover a la bandeja"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "¿Quieres borrar permanentemente los archivos seleccionados?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Borrar Archivos Seleccionados"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Borrar Método</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover a la bandeja en vez de borrar inmediatamente"
 
@@ -1197,11 +1215,11 @@ msgstr "Volumen:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1217,15 +1235,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Escoge una carpeta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1255,194 +1269,278 @@ msgstr ""
 "este programa; si no, escribe a la Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Guardar en el directorio original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Guardar en directorio personalizado:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Generar nombre de archivo de:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nombre de archivo original"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nombre original de archivo (sin sufijo)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta original del archivo"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Agregar número de pista al nombre de archivo"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "General"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Estéreo Unido"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Monoaural"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Calidad del algoritmo:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Tasa de Muestreo de Salida:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tasa de Bits / Relación de Compresión:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Calidad del Algoritmo:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Tasa de Compresión"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Modo de audio:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Otros:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Modo de Audio:"
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Cumplir normas ISO estrictas"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Habilitar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Forzar estríctamente tasa de bits mínima"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Tasa de bits mínima:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Tasa de bits máxima:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Promedio de tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Tasa de bits promedio:"
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forzar estríctamente tasa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omitir encabezado VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parámetros de Marco:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Encabezados del Marco</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marcar como copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Etiquetas ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiquetas versión 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Sólo agrega etiqueta v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Sólo agrega etiqueta v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Calidad (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "General"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,7 +1552,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1462,19 +1560,19 @@ msgstr ""
 "Plugin GIO para Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo leer-y-anexar no soportado"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "modo abierto invalido"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1494,32 +1592,10 @@ msgstr ""
 "\n"
 "Licencia: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de Espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Spectrum Analyzer para Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basado en el plugin XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
-"4Front Technologies\n"
-"\n"
-"Licencia: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Atajos GNOME"
@@ -1540,8 +1616,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1598,8 +1674,8 @@ msgstr "Columnas disponibles"
 msgid "Displayed columns"
 msgstr "Columnas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Herramienta de Búsqueda"
 
@@ -1627,335 +1703,338 @@ msgstr "Desacoplar"
 msgid "Disable"
 msgstr "Dehabilitar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Abrir archivos..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "A_gregar archivos..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Agregar U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Buscar en Bib_lioteca"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "A_cerca..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Ajustes"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Pa_usa"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Anterior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Siguie_nte"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "A_leatorio"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Aleatorio por Albu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_No avanzar Lista de Reprod."
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Detener D_espués de Esta Pista"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Información de pista..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Saltar al _tiempo"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _pista"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Configura Punto _A de Repetición"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Configura Punto _B de Repetición"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Borrar Puntos de Repetición"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Por _Nombre de Archivo"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Por _Ruta de Archivo"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Por _Núm de pista"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Por_Artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Por Al_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Por Artista de Álbu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Por _Fecha de Lanzamiento"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Por _Género"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Por _Duración"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Por _Ruta del Archivo"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Por Título _Personalizado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Invertir Orden"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "O_rden Aleatorio"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Reproducir/Reanudar"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Ordenar Se_leccionados"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Remover _Duplicados"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Remover Archivos No _Disponibles"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Ad_ministrador de Listas de Reproducción ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Administrador de _Colas ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Aumentar Volumen"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Disminuir Volumen"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Ecualizador ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fectos ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "G_rabar Stream"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Ajuste_s de Audio ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menú"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de I_nformación"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar Barra de Información de Vis_ualización"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de E_stado"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostrar Tiempo _Restante"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualizaciones ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de Reproducción"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Salida"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Formar/Desformar"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "A_brir Carpeta Contenedora"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Recargar Seleccionado"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Copiar al _Final"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Seleccion_ar todo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
@@ -1996,58 +2075,57 @@ msgstr "Teclas de flechas buscan por:"
 msgid "Scroll on song change"
 msgstr "Desplazar al cambiar de pista"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Almacenando en buffer..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "monoaural"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo sencillo."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo Lista de Reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Detener después de la pista."
 
@@ -2055,9 +2133,9 @@ msgstr "Detener después de la pista."
 msgid "Previous track"
 msgstr "Pista previa"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproducir"
 
@@ -2065,8 +2143,8 @@ msgstr "Reproducir"
 msgid "Pause/Resume"
 msgstr "Pausa/Continuar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Detener"
 
@@ -2165,7 +2243,7 @@ msgstr "<b>Asociación de Teclas:</b>"
 msgid "_Add"
 msgstr "_Agregar"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Hotkeys Globales"
 
@@ -2196,26 +2274,26 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automáticamente conectar a puertos de salida"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Solo %d puertos de salida JACK fueron encontrados pero %d son requeridos."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falla al conectar al puerto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2223,11 +2301,11 @@ msgstr ""
 "JACK solo soporta audio de punto flotante. Debes cambiar la profundidad de "
 "bit de salida a punto flotante en las preferencias de Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Falla al conectar al servidor JACK; ¿Se está ejecutando?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2332,48 +2410,48 @@ msgstr "Reconectar a servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Espera entes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Letras de canción no disponibles"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Error"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Incapaz de traer %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Incapaz de analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras de canción ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Sin metadatos de pista"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando a lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Editar letras ..."
 
@@ -2385,17 +2463,17 @@ msgstr "Listas de Reproducción M3U"
 msgid "Tact Generator"
 msgstr "Generador Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2550,15 +2628,15 @@ msgstr "Estos ajustes tomarán efecto cuando Audacious reinicie."
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avanzado</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Usar el cálculo preciso de longitud (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Envolvente"
 
@@ -2570,35 +2648,35 @@ msgstr "Servidor MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Error al analizar redirección"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Error HTTP desconocido"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Error al analizar URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Demasiadas redirecciones"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones en Escritorio"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2634,15 +2712,15 @@ msgstr ""
 "Deberías haber recibido una copia de la GNU General Public License junto con "
 "este programa. Si no, mira en <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Mostrar los controles de reproducción"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Siempre mostrar la notificación"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Incluir nombre del álbum en la notificación"
 
@@ -2650,21 +2728,21 @@ msgstr "Incluir nombre del álbum en la notificación"
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Salida OSS3"
 
@@ -2706,23 +2784,23 @@ msgstr ""
 "Me gustaría agradecer a la ente de #audacious, especialmente a Tony Vroon y "
 "John Lindgren y por supuesto a los autores del plugin OSS anterior."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Administrador de Lista de Reproducción"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Ren_ombrar"
 
@@ -2734,51 +2812,49 @@ msgstr "Listas de reproducción PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Salida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Plugin de Salida Audacious PulseAudio\n"
+"Plugin de Salida PulseAudio Audacious\n"
 "\n"
-"Este programa es software libre; lo puedes redistribuir y/o modificar\n"
-"bajo los términos de la GNU General Public License como es publicada \n"
-"por The Free Software Foundation; ya sea de la versión 2 de la Licencia,\n"
-"o (dependiendo de tu opinión) cualquier otra versión posterior.\n"
+"Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo "
+"los términaos de la GNU General Public License como es publicada por la Free "
+"Software Foundation; ya sea la versión 2 de la Licencia, o (a tu elección) "
+"cualquier versión posterior. \n"
 "\n"
-"Este programa es distribuido con la esperanza de que será util, \n"
-"pero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o "
-"IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\n"
-"Mira la GNU General Public License para más detalles.\n"
+"Este programa es distribuido con la esperanza que será útil, pero SIN "
+"GARANTÍA ALGUNA; sin la garantía implícita de MERCANTILIZACIÓN o PROPIA PARA "
+"UN PROPÓSITO EN PARTICULAR. Ve la GNU General Public License para más "
+"detalles.\n"
 "\n"
-"Deberás haber recibido una copia de la GNU General Public License\n"
-"junto con este programa; si no, escribe a la Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
-"02110-1301, USA."
+"Deberías de recibir una copia de la GNU General Public License junto con "
+"este programa; si no, escribe a la Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Salida QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2792,47 +2868,73 @@ msgstr ""
 "Basado en el Plugin de Salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analyzer para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Basado en el plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
+"4Front Technologies\n"
+"\n"
+"Licencia: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Trabajando ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Información"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Buscar"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Abrir Carpeta ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Agregar Carpeta ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Inspector de Registro ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Abrir Archivos"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Agregar Archivos"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Aleatorio"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Abrir Carpeta ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Agregar Carpeta ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Inspector de Registro ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
@@ -2876,7 +2978,7 @@ msgstr "<b>Conversión</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Tasa:"
 
@@ -2928,60 +3030,47 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Agregando datos -scrobbling- para usuario: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso Denegado"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Verificando acceso a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accede al siguiente vínculo para permitir que Audacious agregue datos -"
-"scrobble- a tus reproducciones:"
+"Tus scrobbles están siendo guardados temporalmente en tu computadora. Serán "
+"enviados tan pronto como permitas el acceso a Audacious."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Mantiene esta ventana abierta y da clic en  'Verificar Permiso' otra vez.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Permiso otorgado. Scrobbling para usuario %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"No te preocupes. Tus datos agregados han sido guardados en tu computadora.\n"
-"Ellos serán enviados tan pronto como a Audacious le sea permitido hacerlo."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema de Red."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Hay un problema contactando Last.fm. Por favor, intenta después."
+"Permiso denegado. Abre el siguiente URL en un navegador, permite a Audacious "
+"acceder a tu cuenta, luego has clic otra vez en \"Verificar Permiso\":"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Verificando..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Hubo un problema contactando a Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "V_erificar Permiso"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Verificar Permiso"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revocar Permiso"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Revocar Permiso"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Necesitas permitir que Audacious transfiera los metadatos  de las pistas "
-"\"scrobblee\" a tu cuenta Last.fm\n"
+"Necesitas permitir que Audacious scrobblee pistas a tu cuenta de Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3012,7 +3101,7 @@ msgstr ""
 "Gracias a John Lindgren por echárme una mano al comienzo de este proyecto.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3020,11 +3109,11 @@ msgstr ""
 "Audacious está usando ahora una versión mejorada de Last.fm Scrobbler.\n"
 "Por favor revisa las Preferencias para el plugin Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3032,58 +3121,58 @@ msgstr ""
 "Plugin de salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Librería"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d oculto)"
 msgstr[1] "(%d ocultos)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d pista"
 msgstr[1] "%d pistas"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "de este género"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "en"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "por"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Crear Lista de Reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Agregar a la Lista de Reproducción"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Buscar librería"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3091,11 +3180,11 @@ msgstr ""
 "Para importar tu librería de música en Audacious, selecciona una carpeta y "
 "luego haz clic en el ícono \"actualizar\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Por favor espere..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Seleccione Carpeta"
 
@@ -3191,15 +3280,15 @@ msgstr "Umbral:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Repite puntos borrados."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Repite punto A configurado."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Repite punto B configurado."
 
@@ -3251,373 +3340,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ecualizador de Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Saltar a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: central"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menú de Opciones"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Deshabilitar 'Siempre Encima'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Habilitar 'Siempre Encima'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caja de Información del Archivo"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Tamaño Doble"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualizaciones"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Grabando enc. "
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Grabando apag."
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Más Volumen"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Menos Volumen"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efectos ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Grabar Stream"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Ajustes de Audio ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Abrir Archivos ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Abrir URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Buscar Librería"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de Reproducción"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Salida"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servicios"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Acerca ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Ajustes ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Salir"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Información de Pista ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Aleatorio por Álbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "No avanzar Lista de Reproducción"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Detener Al Terminar Esta Pista"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Establecer Repetición A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Limpiar Repetición A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Saltar a la Pista ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Saltar al Tiempo ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Reproducir/Reanudar"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nueva Lista de Reproducción"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Renombrar Lista de Reproducción"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Remover Lista de Reproducción"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Lista de Reproducción Previa"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Siguiente Lista de Reproducción"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importar Lista de Reproducción ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportar Lista de Reproducción ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Administrador de Listas de Reproducción ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Administrador de Fila ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Refrescar Lista de Reproducción"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostrar Editor de Listas de Reproducción"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostrar Ecualizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Mostrar Tiempo Restante"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Siempre Encima"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "En Todas Las Áreas de Trabajo"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Enrollar Reproductor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Enrollar Editor de Listas de Reproducción"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Enrollar Ecualizador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Agregar URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Agregar Archivos ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Por Nombre de Archivo"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Por Ruta de Archivo"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Quitar Todo"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Limpiar Cola de reproducción"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Remueve los Archivos No Disponibles"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Remover Duplicados"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Remover No Seleccionados"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Remover Seleccionados"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Buscar y Seleccionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertir Selección"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Selecciona ninguno"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Selecciona Todo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Por Número de Pista"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Por Álbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Por Artista de Álbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Por Fecha de Lanzamiento"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Por Género"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Por Duración"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Por Título Personalizado"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Aleatorizar Lista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Invertir Lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordenar Seleccionado"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenar Lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Abrir Carpeta Contenedora"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Copiar al Final"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "A la Fila/Quitar de la Fila"
 
@@ -3630,15 +3727,15 @@ msgstr "Editor de Listas de Reproducción de Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface Clásica de Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Abrir Carpeta ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Agregar Carpeta ..."
 
@@ -3726,7 +3823,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Medio"
 
@@ -3862,7 +3959,7 @@ msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3903,62 +4000,62 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
 "02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Salida Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (en blanco para predeterminado):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Guardar y restaurar volumen:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Error Sndio: Formato de audio no soportado (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Error Sndio: falló sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Error Sndio: falló sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Error Sndio error: falló sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Cambiar Pista"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Comandos</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Comando para ejecutar cuando inicie una nueva pista:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Comando para ejecutar al finalizar una pista:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando para ejecutar al finalizar una lista de reproducción:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando para ejecutar cuando el título de pista cambie (para transmisión por "
 "red):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3967,7 +4064,7 @@ msgstr ""
 "antes de ejecutar el comando (no todos son útiles para el comando fin-de-la-"
 "lista-de-reprod.):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3993,7 +4090,7 @@ msgstr ""
 "%t: Posición en lista de Reprod.\n"
 "%T: Título (sin formato)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4001,15 +4098,15 @@ msgstr ""
 "Los parámetros dados al shell deberían ser encapsulados entre comillas. Los "
 "parámetros sin comillas pueden llevar a resultados inesperados."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Información de Pista"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4023,43 +4120,43 @@ msgstr ""
 "Basado en el Plugin Sample Rate Coverter\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Bajo"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Muy Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y Tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidad y Tono</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tono:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícono de Estado"
 
@@ -4163,12 +4260,12 @@ msgstr "<b>Extra Estéreo</b>"
 msgid "Tone Generator"
 msgstr "Generador de Tonos"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
@@ -4191,7 +4288,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Removedor de Voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4268,7 +4365,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4279,19 +4376,31 @@ msgstr ""
 "Basado en in_vtx.dll por Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin para Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "waveOut Win32 "
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Plugin para Audacious Win32 waveOut \n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4305,14 +4414,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuración XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorar duración del archivo"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de Reprod. XML Compartibles (XSPF)"
diff --git a/po/et.po b/po/et.po
index 3ec224e..e82df64 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,10 +7,10 @@
 # Ivar Smolin <okul@linux.ee>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Estonian (http://www.transifex.com/jlindgren/audacious/"
 "language/et/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -28,27 +28,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Äratus"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -99,147 +99,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "See on sinu äratus."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Reede"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Aeg"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Vaikimisi äratuskell:"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr " "
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Vaigistamine pärast:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "tundi"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutit"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Vali päevad, mil äratus tööle hakkab"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Päev"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Päevad"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Sumbumine"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekundit"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Valjus"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Alguses"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Lõpuks"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Praegune"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Täiendav käsk"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "lubatud"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Esitusnimekiri (valikuline)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Valikud"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Mida need valikud tähendavad?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Abi"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albumi graafika"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr ""
 
@@ -276,11 +276,11 @@ msgstr "Miksimisseade:"
 msgid "Mixer element:"
 msgstr "Miksimiselement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -303,68 +303,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -372,86 +372,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont faili valimine"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Faili nimi"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Suurus (baitides)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI-andmed </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Vorming:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Kestus (msek):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI kommentaarid ja laulusõnad </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* selles MIDI-failis pole kommentaare *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* selles MIDI-failis pole laulusõnu *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (vigane UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -463,7 +477,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -515,154 +529,150 @@ msgstr "Pausi lõpetamine"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD käivitamine pausitud loo jätkamisel."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Paigutus"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Suhteline nihe X-teljel:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Suhteline nihe Y-teljel:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Suurim OSD laius:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Mitme monitori valikud"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD kuvatakse:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "kõigil monitoridel"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitoril"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Ajastus (millisekundites)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Kuvamine:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Sujuv näitamine:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Sujuv peitmine:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjatüüp %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Vari"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Renderdamise laad"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Värvused"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Värvus %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Päästik on lubatud"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Sündmus"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Võltsitud läbipaistvus"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tegelik läbipaistvus (vajab X Composite laiendust)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audaciouse OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Asukoht"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animatsioon"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Kaunistused"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Päästikud"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Muu"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -678,11 +688,11 @@ msgstr "ASXv1/ASXv2-esitusnimekirjad"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audaciouse esitusnimekirjad (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -706,15 +716,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -726,118 +736,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP asemel kasutatakse HTTP-d"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Seade on tühi."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Plaadi liik pole toetatud."
 
@@ -990,58 +1000,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Loobu"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1079,11 +1091,11 @@ msgstr ""
 msgid "Echo"
 msgstr "Kaja"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1093,15 +1105,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Kataloogi valimine"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1118,194 +1126,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Väljundfaili vorming:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Salvestatakse algkataloogi"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Üldine"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automaatne"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmi kvaliteet:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitikiirus (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Pakkimistihedus"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audiorežiim:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Veakaitse"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvaliteet"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Liik:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Vähim bitikiirus (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Suurim bitikiirus (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Keskmine bitikiirus (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:920
-msgid "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
+#: src/filewriter/filewriter.cc:526
+msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Lisatakse ainult v1 silt"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Lisatakse ainult v2 silt"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvaliteet"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Sildid"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kvaliteedi tase (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Üldine"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1313,25 +1405,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO-plugin"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1343,23 +1435,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1376,8 +1455,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Kirje number"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Pealkiri"
@@ -1434,8 +1513,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Otsinguvahend"
 
@@ -1463,335 +1542,338 @@ msgstr ""
 msgid "Disable"
 msgstr "Keela"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Ava failid ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Ava _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Lisa faile ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Lisa U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Programmist lähemalt"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Välju"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Esita"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Peata"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Seiska"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Ee_lmine"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Järgmine"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Ko_rduv"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Se_gatud"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Esitusnimekirja ei _kasutata"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "L_oo andmed ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_Hüppa määratud ajale..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Vaheta lugu ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Peal_kirja järgi"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Loo _numbri järgi"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_Esitaja järgi"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "_Väljalaske kuupäeva järgi"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "_Faili raja järgi"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Ko_handatud pealkirja järgi"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Pööra järjestus tagurpidi"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Järjestus juhuslikuks"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Värskenda"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sordi"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Ee_malda kättesaamatud failid"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Uus"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Muu_da nime"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Impordi ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Ekspordi ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Esitusnimekirjade _haldur.."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Halda _järjekorda ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Valjemaks"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Va_iksemaks"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Menüüriba on nähtaval"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "_Teaberiba on nähtaval"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_Olekuriba on nähtaval"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Esitamine"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "E_situsnimekiri"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Teenused"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Väl_jund"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Vaade"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Järjekorda/järjekorrast maha"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Lõika"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Val_i kõik"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Muuda nime..."
 
@@ -1832,58 +1914,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK liides"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Puhverdamine ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanal"
 msgstr[1] "%d kanalit"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Ühe loo režiim."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Esitusnimekirja režiim."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Seiskamine pärast loo lõppu."
 
@@ -1891,9 +1972,9 @@ msgstr "Seiskamine pärast loo lõppu."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Esita"
 
@@ -1901,8 +1982,8 @@ msgstr "Esita"
 msgid "Pause/Resume"
 msgstr "Pausimine/pausi lõpetamine"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Seiska"
 
@@ -2001,7 +2082,7 @@ msgstr "<b>Kiirklahv:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2020,35 +2101,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2135,48 +2216,48 @@ msgstr "Taasühendumine LIRC-serveriga"
 msgid "Wait before reconnecting:"
 msgstr "Enne taasühendumist oodatakse"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Viga"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Ühendumine saidiga lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2188,17 +2269,17 @@ msgstr "M3U-esitusnimekirjad"
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Taktigeneraator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Taktigeneraator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2346,15 +2427,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Ruumiline heli"
 
@@ -2366,35 +2447,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS-plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Töölauateavitused"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2414,15 +2495,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2430,21 +2511,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausi"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2481,23 +2562,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2509,35 +2590,34 @@ msgstr "PLS-esitusnimekirjad"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio väljund"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2546,47 +2626,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Eelmine"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Korduv"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Segatud"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2628,7 +2725,7 @@ msgstr ""
 msgid "Method:"
 msgstr "Meetod:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2680,52 +2777,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2749,74 +2835,74 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-väljund"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Teek"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "Loo _esitusnimekiri"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Lisa esitusnimekirja"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Otsing audiokogust"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2824,11 +2910,11 @@ msgstr ""
 "Oma audiokogu importimiseks Audaciousesse vali kataloog ja vajuta "
 "värskendamise ikoonile."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Palun oota..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Kataloogi valimine"
 
@@ -2922,15 +3008,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2982,373 +3068,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audaciouse ekvalaiser"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Valjus: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Valikute menüü"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Esitamine"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Esitusnimekiri"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Vaade"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Esitusnimekirja ei kasutata"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Uus esitusnimekiri"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Näita esitusnimekirja redaktorit"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Näita ekvalaiserit"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Alati pealmine"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Pealkirja järgi"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Eemalda kõik"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Puhasta järjekord"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Eemalda kättesaamatud failid"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Eemalda korduvad kirjed"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Eemalda valimata kirjed"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Eemalda valik"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Otsi ja vali"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Vaheta valitud ja valimata"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Tühista valik"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Loo numbri järgi"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Esitaja järgi"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Albumi järgi"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Sega nimekiri"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Pööra järjestus ümber"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Valiku sortimine"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Nimekirja sortimine"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Aseta"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3361,15 +3455,15 @@ msgstr "Audaciouse esitusnimekirja redaktor"
 msgid "%s (%d of %d)"
 msgstr "%s (%d/%d-st)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3457,7 +3551,7 @@ msgid "Slow"
 msgstr "Aeglane"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Keskmine"
 
@@ -3592,7 +3686,7 @@ msgstr "Otsingule vastavatest kirjetest luuakse uus esitusnimekiri"
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3614,66 +3708,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Loovahetus"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3688,21 +3782,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3711,43 +3805,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Olekuikoon"
 
@@ -3833,12 +3927,12 @@ msgstr ""
 msgid "Tone Generator"
 msgstr "Toonigeneraator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Toonigeneraator: "
 
@@ -3855,7 +3949,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Hääle eemaldamine"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3904,26 +3998,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX-dekooder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack dekooder"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3934,14 +4038,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF-dekooder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Jagatavad XML-esitusnimekirjad (XSPF)"
diff --git a/po/eu.po b/po/eu.po
index f28b353..c9278e3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,10 +8,10 @@
 # Osoitz <oelkoro@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Basque (http://www.transifex.com/jlindgren/audacious/language/"
 "eu/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -29,27 +29,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -100,147 +100,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Hau da zure esnatzeko deia:"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Gogorarazlea"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Astelehena"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Ostirala"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Igandea"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Denbora"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma noiz (lehenetsia):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "o"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Isildu hau eta gero:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "orduak"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutuak"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Aukeratu alarmak jotzeko egunak"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Eguna"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Egunak"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Progresioa"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundo"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Bolumena"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Hasi hemen "
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Bukaeran"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Oraingoa"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Komando gehigarria"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "gaitu"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Erreprodukzio-zerrenda (aukerazkoa)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Zer esan nahi dute aukera hauek?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Diskoaren azala"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr ""
 
@@ -277,11 +277,11 @@ msgstr "Nahastailearen gailua:"
 msgid "Mixer element:"
 msgstr "Nahaslea:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -304,68 +304,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -373,86 +373,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - hautatu SoundFont fitxategia"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Fitxategi izena"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamaina (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Izena:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI informazioa </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formatua:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Luzera (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Pista kopurua:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "aldagaia"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Denbora zat:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI iruzkinak eta letrak </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* iruzkinik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* letrarik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 baliogabea)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -464,7 +478,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -517,94 +531,94 @@ msgstr "Jarraitu"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSDa abiarazten du erreprodukzioa jarraitzean."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Kokalekua"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "OSDaren gehi. zabalera:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Pantaila anitzen aukerak"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Bistaratu OSDa hau erabiliz:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "pantaila guztiak"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "%i. pantaila"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Tenporizadorea (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Bistaratu:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Pixkanaka agertu:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Iraungitu:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "%i letra-tipoa:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Itzala"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Errendatze estiloa"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Koloreak"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "%i kolorea:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Gaitu abiarazlea"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Gertaera"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Kudeatzaile konposatua detektatuta"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -614,60 +628,56 @@ msgstr ""
 "Bat exekutatzen dagoela jakin ezean, aktibatu konposaketako kudeatzalea "
 "bestela OSDak ez du ongi funtzionatuko"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Gardentasun faltsua egiteko ez da konposaketako kudeaketak behar"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Gardentasuna"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Gardentasun faltsua"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Egitako gardentasuna (Xen konposaketa hed. behar da)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Konposaketako hedapena ez da kargatu"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Konposaketako hedapena ez dago erabilgarri"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSDa</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posizioa"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animazioa"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Testua"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekorazioa"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Abiarazlea"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Hainbat"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -683,11 +693,11 @@ msgstr ""
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -711,15 +721,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD plugina"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -731,118 +741,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Gailua</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadatuak</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Erabili CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Erabili CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP erabili CDDBP ordez"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Bidea:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Portua:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CDa"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Unitatea hutsik dago"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Onartu gabeko disko mota."
 
@@ -995,58 +1005,60 @@ msgstr "Intentsitatea:"
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Utzi"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1084,11 +1096,11 @@ msgstr "Bolumena:"
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg plugina"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1098,15 +1110,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Hautatu karpeta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1123,194 +1131,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Irteerako fitxategi-formatua:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Gorde jatorrizko direktorioan"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Orokorra"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automatikoa"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estereoa"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Monoa"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmoaren kalitatea:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bit-tasa (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Konpresio-tasa:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audio modua:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Erroreen aurkako babesa"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kalitatea"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Gaitu VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Mota:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR aukerak:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Gutxieneko bit-tasa (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Gehienezko bit-tasa (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Derrigortu gutxieneko bit-tasa"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR aukerak:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Batez besteko bit-tasa (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR kalitate-maila:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Derrigortu gutxieneko bit-tasa"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Markatu copyright gisa"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Markatu jatorrizko gisa"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Derrigortu v2 etiketa gehitzea"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Gehitu v1 etiketa soilik"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Gehitu v2 etiketa soilik"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kalitatea"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiketak"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kalitate maila (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Orokorra"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC Deskodetzailea"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1318,25 +1410,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO plugina"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1348,23 +1440,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1381,8 +1460,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Sarera zenbakia"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titulua"
@@ -1439,8 +1518,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr ""
 
@@ -1468,335 +1547,338 @@ msgstr ""
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Ireki fitxategiak"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Ireki BKU ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "I_rten"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "Erreproduzitu"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Pausatu"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "Gelditu"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Aurrekoa"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Ilara Kudeatzailea..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Ilararatu/Ilaratik kendu"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr ""
 
@@ -1837,58 +1919,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Interfazea"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "monoa"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estereoa"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "kanal %d"
 msgstr[1] "%d kanal"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Single modua."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Erreprodukzio-zerrenda modua."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Kantuaren ostean geldituko da."
 
@@ -1896,9 +1977,9 @@ msgstr "Kantuaren ostean geldituko da."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Erreproduzitu"
 
@@ -1906,8 +1987,8 @@ msgstr "Erreproduzitu"
 msgid "Pause/Resume"
 msgstr "Pausatu/jarraitu"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Gelditu"
 
@@ -2006,7 +2087,7 @@ msgstr "<b>Tekla-konbinazioa:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2025,35 +2106,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2139,48 +2220,48 @@ msgstr "Berkonektatu LIRC zerbitzarira"
 msgid "Wait before reconnecting:"
 msgstr "Itxaron berkonektatu aurretik:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki plugina"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Errorea"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2192,17 +2273,17 @@ msgstr "M3U Erreprodukzio-zerrendak"
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Ukimen sortzailea: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Ukimen sortzailea: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2350,15 +2431,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 plugina"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2370,35 +2451,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS plugina"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Geldituta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious ez da jotzen ari."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2418,15 +2499,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2434,21 +2515,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausatu"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2485,23 +2566,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2513,35 +2594,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Deskodetzailea"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2550,47 +2630,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Errepikatu"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Ausazkoa"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2632,7 +2729,7 @@ msgstr ""
 msgid "Method:"
 msgstr ""
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2684,52 +2781,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2753,84 +2839,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr ""
 
@@ -2924,15 +3010,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2984,373 +3070,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious-en ekualizadorea"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Bilatu %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Bolumena: %% %d"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balantzea: %% %d ezkerrean"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balantzea: erdian"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balantzea: %% %d eskuinean"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Aukeren menua"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desgaitu 'Beti gainean'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Gaitu 'Beti gainean'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Fitxategi-informazioaren koadroa"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Erreprodukzioa"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Erreprodukzio-zerrenda"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ikusi"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Erreprodukzio-zerrenda aurreraturik ez"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Erakutsi erreprodukzio-zerrendaren editorea"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Erakutsi ekualizadorea"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Beti gainean"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Tituluaren arabera"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Kendu guztiak"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Garbitu ilara"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Kendu fitxategi erabilkaitzak"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Kendu bikoiztuak"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Kendu desautatutakoak"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Kendu hautatutakoak"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Bilatu eta hautatu"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Alderantzikatu hautapena"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Ez hautatu ezer"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Artistaren arabera"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Diskoaren arabera"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Nahastu ausaz zerrenda"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Alderantzikatu zerrenda"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordenatu hautatutakoak"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenatu zerrenda"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Moztu"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3363,15 +3457,15 @@ msgstr "Audacious erreprodukzio-zerrendaren editorea"
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3459,7 +3553,7 @@ msgid "Slow"
 msgstr "Motela"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Tartekoa"
 
@@ -3595,7 +3689,7 @@ msgstr "Sortu erreprodukzio-zerrenda berria bat datozen sarrerekin"
 msgid "Sndfile Plugin"
 msgstr "Sndfile plugina"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3617,66 +3711,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3691,21 +3785,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3714,43 +3808,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Abiadura eta Tonoa"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Abiadura eta Tonoa</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tonoa:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr ""
 
@@ -3836,12 +3930,12 @@ msgstr ""
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Tonu-sortzailea: "
 
@@ -3858,7 +3952,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3907,26 +4001,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Deskodetzailea"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Deskodetzailea"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3937,14 +4041,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Deskodetzailea"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 856016c..28fc3f5 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -7,10 +7,10 @@
 # vandu <vandusoft@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/jlindgren/audacious/"
 "language/fa_IR/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -28,27 +28,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "هشدار"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -99,147 +99,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "این تماس بیدارباش شما است."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "یادآوری"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "سه‌شنبه"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "پنج‌شنبه"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "جمعه"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "شنبه"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "زمان"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "هشدار در (پیش‌فرض):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "س"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "خاموش شود بعد از:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "ساعت"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "دقیقه"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "روزهای مورد نظر برای هشدار انتخاب شود"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "روز"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "روزها"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "محو شدن"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "ثانیه‌ها"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "صدا"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "شروع از"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "پایان"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "جاری"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "فرمان تکمیلی"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "فعال‌سازی"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "لیست پخش (اختیاری)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "گزینه‌ها"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "معنای این گزینه‌ها چیست؟"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "راهنمایی"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr ""
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr ""
 
@@ -276,11 +276,11 @@ msgstr "ابزار میکسر:"
 msgid "Mixer element:"
 msgstr "عنصر میکسر:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -303,68 +303,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -372,86 +372,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "هرتز"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - فایل SoundFont انتخاب شود"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "نام فایل"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "اندازه (بایت)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "نام:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> ‏اطلاعات MIDI ‏</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "فرمت:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "مدت زمان (میلی‌ثانیه):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "متغیر"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "‎BPM (wavg)‎:"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "قسمت زمان:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> توضیحات و ترانه‌های MIDI‏ </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* توضیحاتی در این فایل MIDI وجود ندارد *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ترانه‌ای در این فایل MIDI وجود ندارد *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "بستن"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(UTF-8 نامعتبر)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -463,7 +477,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -515,94 +529,94 @@ msgstr "توقف خاموش"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "وقتی از پخش از حالت توقف خارج شد OSD اجرا شود."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "محل قرارگیری"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "فاصله نسبی از عرض:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "فاصله نسبی از ارتفاع:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "حداکثر طول OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "گزینه‌های حالت چندنمایشگره"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "نمایش OSD بوسیله:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "همه نمایشگرها"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "نمایشگر ‎%i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "زمان‌بندی (برحسب میلی‌ثانیه)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "نمایش:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "نمایش تدریجی:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "خروج تدریجی:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "فونت‌ها"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "فونت ‎%i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "سایه"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "شیوه رندر"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "رنگ ‎%i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "فعال‌سازی اجرا"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "رخداد"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "مدیرکامپوزیت یافت شد"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -612,60 +626,56 @@ msgstr ""
 "اگر می‌دانید در حال اجراست، لطفا یک مدیر کامپوزیت را فعال کنید، در غیراینصورت "
 "OSD‌ بدرسی نشان داده نمی‌شود"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "برای شفافیت ساختگی نیازی به مدیر کامپوزیت نیست"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "شفافیت"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "شفافیت ساختگی"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "شفافیت واقعی (به افزونه کامپوزیت X نیاز دارد)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "افزونه کامپوزیت بارگذاری نشده است"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "افزونه کامپوزیت در دسترس نیست"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "مکان"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "پویانمایی"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "متن"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "تزیینات"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "تریگر"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "متفرقه"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -681,11 +691,11 @@ msgstr ""
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -709,15 +719,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -729,118 +739,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "بجای CDDBP از HTTP استفاده کن"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "سی‌دی صوتی"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "درایو خالی است."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "نوع دیسک پشتیبانی نمی‌شود."
 
@@ -993,58 +1003,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "حذف"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "انصراف"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1082,11 +1094,11 @@ msgstr ""
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1096,15 +1108,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "یک پوشه را انتخاب کنید"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1121,194 +1129,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "فرمت فایل خروجی:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "ذخیره در پوشه اصلی"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "عمومی"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "خودکار"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "یکی کردن دو کانال"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "دوکاناله"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "تک‌کاناله"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "کیفیت الگوریتم:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(هرتز)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "نرخ بیت (کیلوبیت بر ثانیه):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "نسبت فشرده‌سازی:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "حالت صدا:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "محافظت در برابر خطا"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "کیفیت"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "فعال‌سازی VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "نوع:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "گزینه‌های VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "حداقل نرخ بیت (کیلوبیت بر ثانیه):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "حداکثر نرخ بیت (کیلوبیت بر ثانیه):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "حداقل نرخ بیت بشدت اعمال شود"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "گزینه‌های ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "نرخ بیت میانگین (کیلوبیت بر ثانیه):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "سطح کیفیت VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "حداقل نرخ بیت بشدت اعمال شود"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR نرخ بیت متغیر/نرخ بیت میانگین"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "فایل کپی‌رایت دارد"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "فایل نسخه اصلی است"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "برچسب‌های نسخه 2 حتما اضافه شود"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "فقط برچسب‌های نسخه 1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "فقط برچسب‌های نسخه 2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "کیفیت"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR نرخ بیت متغیر/نرخ بیت میانگین"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "برچسب‌ها"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "سطح کیفیت (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "عمومی"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1316,25 +1408,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1346,23 +1438,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1379,8 +1458,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "شماره گزینه"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "عنوان"
@@ -1437,8 +1516,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr ""
 
@@ -1466,335 +1545,338 @@ msgstr "جدا کردن پنجره"
 msgid "Disable"
 msgstr "غیرفعال‌سازی"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_بازکردن فایل‌ها ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "بازکردن _آدرس اینترنتی ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "اضافه کردن آدرس _اینترنتی ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "د_رباره ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_خروج"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_پخش"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "تو_قف"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "پا_یان پخش"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_قبلی"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_بعدی"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_تکرار"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_بهم ریخته"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "ا_طلاعات آهنگ ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "پرش به _زمان ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "پرش به _آهنگ ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "براساس _عنوان"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "براساس _شماره آهنگ"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "براساس _هنرمند"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "بر اساس _تاریخ انتشار"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "براساس _مسیر فایل"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "براساس عنوان شخصی"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "مرتب سازی معکوس"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "بهم ریختن مرتب‌سازی"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "تازه‌سازی لیست"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "مرتب کردن"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "جدید"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "وارد کردن ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "خروجی گرفتن ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "مدیر صف ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "افزایش صدا"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "کاهش صدا"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "نمایش نوار منو"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "نمایش نوار اطلاعات"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "نمایش نوار وضعیت"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "فایل"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "پخش"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "لیست پخش"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "سرویس‌ها"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "خروجی"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "نما"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "وارد کردن به/خارج کردن از صف"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "برش"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "کپی"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "چسباندن"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "انتخاب همه"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr ""
 
@@ -1835,57 +1917,56 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "رابط GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "‎%s - Aduacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "تک‌کاناله"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "دوکاناله"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "‎%d کانال"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "‎%d کیلوبیت بر ثانیه"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "حالت تک‌فایل."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "حالت لیست پخش."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "توقف بعد از آهنگ."
 
@@ -1893,9 +1974,9 @@ msgstr "توقف بعد از آهنگ."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "پخش"
 
@@ -1903,8 +1984,8 @@ msgstr "پخش"
 msgid "Pause/Resume"
 msgstr "توقف/ادامه"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "اتمام پخش"
 
@@ -2003,7 +2084,7 @@ msgstr "<b>کلیدهای تعریف‌شده:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2022,35 +2103,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2137,48 +2218,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "خطا"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2190,17 +2271,17 @@ msgstr ""
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "مولد تکت: ‎%d بیت در دقیقه"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "مولد تکت: ‎%d بیت در دقیقه ‎%d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2348,15 +2429,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "فراگیر"
 
@@ -2368,35 +2449,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "متوقف شده"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious در حال پخش نیست."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2416,15 +2497,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2432,21 +2513,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "متوقف"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "بعدی"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2483,23 +2564,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2511,35 +2592,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2548,47 +2628,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "قبلی"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "تکرار"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "بهم‌ریختن"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2630,7 +2727,7 @@ msgstr ""
 msgid "Method:"
 msgstr "شیوه:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2682,52 +2779,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2751,81 +2837,81 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr ""
 
@@ -2919,15 +3005,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2979,373 +3065,381 @@ msgstr "16 کیلوهرتز"
 msgid "Audacious Equalizer"
 msgstr "اکولایزر Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "پیمایش به ‎%d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "صدا: ‎%d%%‎"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "بالانس: ‎%d%%‎ چپ"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "بالانس: مرکز"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "بالانس: ‎%d%%‎ راست"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "منوی گزینه‌ها"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "غیرفعال کردن 'همیشه در بالا'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "فعال کردن 'همیشه در بالا'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "جعبه اطلاعات فایل"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "پخش"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "لیست پخش"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "نما"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "لیست پخش به جلو نرود"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "لیست پخش جدید"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "نمایش ویرایشگر لیست پخش"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "نمایش اکولایزر"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "همیشه در بالا"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "براساس عنوان"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "حذف همه"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "پاکسازی صف"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "پاک کردن فایل‌های خارج از دسترس"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "پاک کردن فایل‌های تکراری"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "حذف انتخاب‌نشده‌ها"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "حذف انتخاب‌شده‌ها"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "جستجو و انتخاب"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "برعکس کردن انتخاب‌ها"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "انتخاب هیچ‌کدام"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "انتخاب همه"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "براساس شماره آهنگ"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "براساس هنرمند"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "براساس آلبوم"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "بهم‌ریختن لیست"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "برعکس کردن ترتیب لیست"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "مرتب‌سازی انتخاب‌شده‌ها"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "مرتب‌سازی لیست"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "برش"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "کپی"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "چسباندن"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3358,15 +3452,15 @@ msgstr "ویرایشگر لیست پخش Audacious"
 msgid "%s (%d of %d)"
 msgstr "‎%s (%d of %d)‎"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3454,7 +3548,7 @@ msgid "Slow"
 msgstr "کند"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "متوسط"
 
@@ -3589,7 +3683,7 @@ msgstr "لیست پخش براساس گزینه‌های یافت شده ایج�
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3611,66 +3705,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3685,21 +3779,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3708,43 +3802,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr ""
 
@@ -3830,12 +3924,12 @@ msgstr ""
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3852,7 +3946,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3901,26 +3995,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3931,14 +4035,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 5a4ed85..f488f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014-2015
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014-2016
 # J. S. Tuomisto <jstuomisto@gmail.com>, 2013
 # J. S. Tuomisto <jstuomisto@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:28+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/jlindgren/audacious/"
 "language/fi/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) -dekooderi"
 
@@ -29,20 +29,20 @@ msgstr "AAC (Raw) -dekooderi"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-soitin)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sarjoitettu"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Herätyskello"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Aseta hälytys..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -52,7 +52,7 @@ msgstr ""
 "\n"
 "Alkuperäiset kehittäjät Adam Feakin ja Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -103,147 +103,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Herätys!"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Muistutuksesi tälle päivälle on..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Maanantai"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Torstai"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Perjantai"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Aika"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Kellonaika (oletus):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Hiljennä, kun aikaa kulunut:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "tunnit"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuutit"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Valitse päivät jolloin herätyskello on aktiivinen"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Päivä"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Oletus"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Päivät"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Häivytys"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekuntia"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Aloita"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Lopullinen"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Nykyinen"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Lisäkomento"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "käytä"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Soittolista (valinnainen)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Valitse soittolista"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Mitä nämä asetukset tarkoittavat?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ohje"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albumin kansikuvitus"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-lähtö"
 
@@ -285,11 +285,11 @@ msgstr "Miksauslaite:"
 msgid "Mixer element:"
 msgstr "Miksauskanava:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-liitännäinen (MIDI-soitin)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -312,68 +312,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Toisto</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Ohita edeltävä hiljaisuus"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ohita lopussa oleva hiljaisuus"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -381,86 +381,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-liitännäinen - valitse SoundFont-tiedosto"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Koko (tavuina)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI-tiedot </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Muoto:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Kesto (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Raitojen lukumäärä:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "muuttuja"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Aikajako:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI-kommentit ja -lyriikat </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI-tiedostossa ei ollut kommentteja *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI-tiedostossa ei ollut lyriikoita *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Sulje"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (virheellinen UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache-selain"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -472,7 +486,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -524,94 +538,94 @@ msgstr "Toisto jatkuu"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Näyttää OSD:n kun toisto jatkuu."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Sijoitus"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Suhteellinen X:n poikkeama:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Suhteellinen Y:n poikkeama:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "OSD:n maksimileveys:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Monen näytön asetukset"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Näytä OSD käyttäen:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "kaikki näytöt"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "näyttö %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Ajoitus (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Näytä:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Häivytä sisään:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Häivytä ulos:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjasin %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Varjo"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Esitystyyli"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Värit"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Väri %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Käytä liipaisinta"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Komposointimanageri havaittu"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -621,60 +635,56 @@ msgstr ""
 "Jos komposointimanageri ei ole vielä päällä, aktivoi se tai muutoin OSD ei "
 "toimi kunnolla."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Komposointimanageria ei tarvita jäljiteltyyn läpinäkyvyyteen"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Jäljitelty läpinäkyvyys"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Oikea läpinäkyvyys (vaatii X:n komposointilaajennuksen)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Komposointilaajennusta ei ole ladattu"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Komposointilaajennus ei ole saatavilla"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Sijainti"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animaatio"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Teksti"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Koristeet"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Liipaisin"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Muut"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -690,11 +700,11 @@ msgstr "ASXv1/ASXv2 -soittolistat"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious -soittolistat (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Väri</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -718,15 +728,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "Leikkaustaajuus:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektrianalysaattori"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Ääni CD -liitännäinen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -746,118 +756,118 @@ msgstr ""
 "\n"
 "Tämä oli Google Summer of Code 2007 -projekti."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Laite</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Lukunopeus:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Laite:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metatiedot</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Käytä CD-tekstiä"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Käytä CDDB:tä"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Käytä HTTP:tä CDDBP:n sijasta"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Polku:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio-alijärjestelmää ei voitu alustaa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Viallinen URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Raitaa %d ei löydetty."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Raita %d on dataraita."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Virhe luettaessa ääni CD:tä."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Ääni CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Ei voitu avata CD-asemaa %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Ääneen kykenevää CD-asemaa ei löydetty."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Avatun CD-aseman alustaminen epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Ei voitu lukea ensimmäistä/viimeistä raitaa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Ei voida lukea alku/loppu LSN:ää raidalle %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "CDDB-yhteyden luonti epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "CDDB-palvelimen kysely epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB-palvelimen kysely epäonnistui: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Ei voitu lukea cddb-tietoa: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Asema on tyhjä."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Levytyyppiä ei tueta."
 
@@ -1016,58 +1026,60 @@ msgstr "Vahvuus:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet -liitännäinen"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Poista tiedostot"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Virhe siirrettäessä kohdetta %s roskakoriin: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Virhe poistaessa kohdetta %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Virhe poistaessa kohdetta %s: ei paikallinen tiedosto."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Haluatko siirtää valitut tiedostot roskakoriin?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Siirrä roskakoriin"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Haluatko poistaa seuraavat tiedostot pysyvästi?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Poista"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Poista valitut tiedostot"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Poistamistapa</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Siirrä roskakoriin pysyvän poistamisen sijaan"
 
@@ -1105,11 +1117,11 @@ msgstr "Äänenvoimakkuus:"
 msgid "Echo"
 msgstr "Kaikuefekti"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg-liitännäinen"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1125,15 +1137,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter-liitännäinen"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Valitse kansio"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1150,194 +1158,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Tiedostoformaatti:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Tallenna alkuperäiseen kansioon"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Tiedostonimen luomisen peruste:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Alkuperäinen tiedostonimi"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Yleiset"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmin laatu:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bittinopeus (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Pakkaussuhde:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Äänitila:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Virhesuojaus"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Laatu"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Käytä VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR-asetukset:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimi bittinopeus (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimi bittinopeus (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Valvo tiukasti minimi bittinopeutta"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR-asetukset:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Bittinopeuden keskiarvo (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR:n laatutaso:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Valvo tiukasti minimi bittinopeutta"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Merkitse tekijänoikeudeksi"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Merkitse alkuperäiseksi"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3-parametrit:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Pakota v2-tagin lisäys"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Lisää vain v1-tagi"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Lisää vain v2-tagi"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Laatu"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tagit"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Laatutaso (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Yleiset"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC-dekooderi"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "häviötön"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1349,7 +1441,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1357,19 +1449,19 @@ msgstr ""
 "GIO-liitännäinen Audacioukselle\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO-liitännäinen"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1381,23 +1473,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spektrianalysaattori"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Gnome-pikanäppäimet"
@@ -1414,8 +1493,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Numero"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Nimi"
@@ -1472,8 +1551,8 @@ msgstr "Käytettävissä olevat sarakkeet"
 msgid "Displayed columns"
 msgstr "Näytettävät sarakkeet"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Etsintätyökalu"
 
@@ -1501,335 +1580,338 @@ msgstr "Poista telakointi"
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Avaa tied_ostot..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Avaa _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Lisää tiedostoja..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Lisää U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "_Etsi kirjastosta"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Tietoja..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Asetukset..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Sulje"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Toista"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Keskeytä"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Kertaus"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "S_ekoitus"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Älä _etene soittolistalla"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "_Pysäytä tämän kappaleen jälkeen"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "K_appaleen tiedot..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Hyppää _aikaan..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Hyppää kappaleeseen..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Aseta kertauksen alkupiste A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Aseta kertauksen loppupiste B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Tyhjennä kertauspisteet"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "_Nimen mukaan"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Tiedosto_polun mukaan"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Ka_ppalenumeron mukaan"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_Esittäjän mukaan"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Al_bumin mukaan"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "_Julkaisupäivämäärän mukaan"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "_Keston mukaan"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "_Tiedostopolun mukaan"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "_Mukautetun nimen mukaan"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Käänteinen järjestys"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Satunnainen järjestys"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Toista/jatka"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Lajittele"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Järjestä _valitut"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Poista _kopiot"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Poista _ei saatavilla olevat tiedostot"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Uusi"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Nimeä _uudelleen..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Poista"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Tuo..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Vie..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Soittolistojen _hallinta..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Jonomanageri..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Nosta äänenvoimakkuutta"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Laske äänenvoimakkuutta"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Taajuuskorjain..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "_Tehosteet..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "_Ääniasetukset..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Näytä _tietopalkki"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Näytä tietopalkin vis_ualisaatio"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Näytä tila_rivi"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Näytä _jäljellä oleva aika"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualisoinnit..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "T_oisto"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Soittolista"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Palvelut"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Ääni"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Näkymä"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Lisää jonoon/Poista jonosta"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Avaa sisältävä kansio"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "L_eikkaa"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Nimeä uudelleen..."
 
@@ -1870,58 +1952,57 @@ msgstr "Nuolinäppäimet siirtävät:"
 msgid "Scroll on song change"
 msgstr "Vieritä kappaleen vaihtuessa"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK-käyttöliittymä"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Puskuroidaan..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanava"
 msgstr[1] "%d kanavaa"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Yksittäinen -tila."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Soittolista -tila."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Pysäytä kappaleen jälkeen."
 
@@ -1929,9 +2010,9 @@ msgstr "Pysäytä kappaleen jälkeen."
 msgid "Previous track"
 msgstr "Edellinen raita"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Toista"
 
@@ -1939,8 +2020,8 @@ msgstr "Toista"
 msgid "Pause/Resume"
 msgstr "Keskeytä/Jatka"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Pysäytä"
 
@@ -2039,7 +2120,7 @@ msgstr "<b>Näppäinsidos:</b>"
 msgid "_Add"
 msgstr "_Lisää"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globaalit pikanäppäimet"
 
@@ -2069,35 +2150,35 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK-lähtö"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Yhteys JACK-porttiin %s epäonnistui."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Yhteys JACK-palvelimeen epäonnistui. Onhan se käynnissä?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2198,48 +2279,48 @@ msgstr "Yhdistä uudelleen LIRC-palvelimelle"
 msgid "Wait before reconnecting:"
 msgstr "Odota ennen uudelleenyhdistämistä:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki-liitännäinen"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Lyriikoita ei saatavilla"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Virhe"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Ei voitu hakea %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Ei voida jäsentää %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Etsitään lyriikoita..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Kappaleen metatiedot puuttuvat"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Yhdistetään lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Muokkaa sanoituksia..."
 
@@ -2251,17 +2332,17 @@ msgstr "M3U-soittolistat"
 msgid "Tact Generator"
 msgstr "Tahtigeneraattori"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tahtigeneraattori: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tahtigeneraattori: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2416,15 +2497,15 @@ msgstr "Nämä asetukset tulevat voimaan, kun Audacious käynnistetään uudelle
 msgid "MPG123 Plugin"
 msgstr "MPG123-liitännäinen"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Lisäasetukset</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Käytä tarkkaa keston laskentaa (hidas)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2436,35 +2517,35 @@ msgstr "MPRIS 2 -palvelin"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS -liitännäinen"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Tuntematon HTTP-virhe"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Liian monta uudelleenohjausta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Pysäytetty"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious ei tällä hetkellä soita mitään."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Työpöytäilmoitukset"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2500,15 +2581,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Näytä toiston kontrollit"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Näytä ilmoitukset aina"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Sisällytä albumin nimi ilmoitukseen"
 
@@ -2516,21 +2597,21 @@ msgstr "Sisällytä albumin nimi ilmoitukseen"
 msgid "Show"
 msgstr "Näytä"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Keskeytä"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4-lähtö"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3-lähtö"
 
@@ -2572,23 +2653,23 @@ msgstr ""
 "Haluaisin kiittää ihmisiä kanavalla #audacious, erityisesti Tony Vroonia "
 "sekä John Lindgreniä. Kiitokset myös edellisen OSS-liitännäisen kehittäjille."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Soittolistan hallinta"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Nimeä uudelleen"
 
@@ -2600,51 +2681,34 @@ msgstr "PLS-soittolistat"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 -dekooderi"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio-lähtö"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audaciouksen PulseAudio-lähdön liitännäinen\n"
-"\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"
-"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,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia-lähtö"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2653,47 +2717,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr ""
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Etsi"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Avaa kansio..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Lisää kansio..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Avaa tiedostoja"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Lisää tiedostoja"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Edellinen"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Kertaus"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Sekoitus"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Avaa kansio..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Lisää kansio..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt-käyttöliittymä"
 
@@ -2737,7 +2818,7 @@ msgstr "<b>Muunnos</b>"
 msgid "Method:"
 msgstr "Metodi:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Näytteenottotaajuus:"
 
@@ -2789,58 +2870,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Päivitetään raitoja käyttäjälle: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Tarkistetaan Last.fm-käyttöoikeutta..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Lupa evätty"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Avaa seuraava linkki salliaksesi Audaciouksen päivittää soitettuja raitojasi:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Pidä tämä ikkuna auki ja paina \"Tarkista oikeudet\" -painiketta uudelleen.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Soitettujen kappaleiden tiedot tallennetaan koneellesi.\n"
-"Tiedot lähetetään heti kun mahdollista."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Verkko-ongelma."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Ongelma Last.fm:ään yhdistäessä."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm -palveluun yhdistettäessä ilmeni ongelmia. Yritä uudelleen."
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Tarkista oikeus"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Tarkistetaan..."
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Hylkää oikeus"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Tarkista oikeudet"
-
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Kumoa oikeudet"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Sinun pitää sallia Audaciouksen päivittää raitoja Last.fm -tilillesi.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2871,7 +2936,7 @@ msgstr ""
 "Kiitos John Lindgrenille avusta projektin alussa.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2879,11 +2944,11 @@ msgstr ""
 "Audacious käyttää parannettua versiota Last.fm Scrobblerista.\n"
 "Scrobbler -liitännäinen löytyy asetuksista."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-lähtö"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2891,58 +2956,58 @@ msgstr ""
 "SDL-lähdön liitännäinen Audacioukselle\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Kirjasto"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d tulos"
 msgstr[1] "%d tulosta"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d piilotettu)"
 msgstr[1] "(%d piilotettua)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d kappale"
 msgstr[1] "%d kappaletta"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Luo soittolista"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "L_isää soittolistalle"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Etsi kirjastosta"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2950,11 +3015,11 @@ msgstr ""
 "Tuodaksesi musiikkikirjastosi Audacioukseen, valitse kansio ja paina sen "
 "jälkeen päivitys painiketta."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Odota..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Valitse kansio"
 
@@ -3048,15 +3113,15 @@ msgstr "Raja-arvo:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Kertauspisteet tyhjennetty."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Kertauksen alkupiste A asetettu."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Kertauksen loppupiste B asetettu."
 
@@ -3108,373 +3173,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audaciouksen taajuuskorjain"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Siirry kohtaan %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Äänenvoimakkuus: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Tasapaino: %d%% vasen"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Tasapaino: keskellä"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Tasapaino: %d%% oikea"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Asetusvalikko"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Poista käytöstä 'Aina päällimmäisenä'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Käytä 'Aina päällimmäisenä'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Tiedoston tietolaatikko"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Tehosteet..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Ääniasetukset..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Avaa tiedostoja..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Avaa URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Etsi kirjastosta"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Toisto"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Soittolista"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Näkymä"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Palvelut"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Tietoja..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Asetukset..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Kappaleen tiedot..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Älä etene soittolistalla"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Lopeta tämän kappaleen jälkeen"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Siirry kappaleeseen..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Siirry kohtaan..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Uusi soittolista"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Nimeä uudelleen soittolista..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Poista soittolista"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Edellinen soittolista"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Seuraava soittolista"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Tuo soittolista..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Vie soittolista..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Soittolistan hallinta..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Jonohallinta..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Päivitä soittolista"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Näytä soittolistan muokkain"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Näytä taajuuskorjain"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Näytä jäljellä oleva aika"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Aina päällimmäisenä"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Kaikissa työtiloissa"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Lisää URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Lisää tiedostoja..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Nimen mukaan"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Poista kaikki"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Tyhjennä jono"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Poista ei saatavilla olevat tiedostot"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Poista kopiot"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Poista ei valitut"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Poista valitut"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Etsi ja valitse"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Käänteinen valinta"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Ei mitään"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Raidan mukaan"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Esittäjän mukaan"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Albumin mukaan"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Sekoita lista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Käännä lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Järjestä valitut"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Lajittele lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Liitä"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3487,15 +3560,15 @@ msgstr "Audaciouksen soittolistan muokkain"
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winampin klassinen käyttöliittymä"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Avaa kansio..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Lisää kansio..."
 
@@ -3583,7 +3656,7 @@ msgid "Slow"
 msgstr "Hidas"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Keskinkertainen"
 
@@ -3719,7 +3792,7 @@ msgstr "Luo uusi soittolista täsmäävistä kappaleista"
 msgid "Sndfile Plugin"
 msgstr "Sndfile-liitännäinen"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3759,68 +3832,68 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Laite (tyhjä oletusta varten):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-virhe: äänimuoto ei ole tuettu (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-virhe: sio_open() epäonnistui"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-virhe: sio_setpar() epäonnistui"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-virhe: sio_start() epäonnistui"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Kappaleen vaihtuminen"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Komennot</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Kappaleen alussa suoritettava komento:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Kappaleen päättyessä suoritettava komento:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Soittolistan päättyessä suoritettava komento:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Suoritettava komento, kun kappaleen nimi muuttuu (verkon suoratoistoja "
 "varten):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3835,21 +3908,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Kappaleen tiedot"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3863,43 +3936,43 @@ msgstr ""
 "Perustuu Sample Rate Converter -liitännäiseen:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Nopea"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Matala"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Korkea"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Erittäin korkea"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Laatu:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Nopeus ja sävelkorkeus"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Nopeus ja sävelkorkeus</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Sävelkorkeus:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Tilaikoni"
 
@@ -3994,12 +4067,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Sointugeneraattori"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Sointugeneraattori:"
 
@@ -4021,7 +4094,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Äänen poisto"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4087,7 +4160,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX-dekooderi"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4097,19 +4170,29 @@ msgstr ""
 "Perustuu in_vtx.dll:ään, luonut Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious liitännäisen luonut Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack-dekooderi"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "häviöllinen (hybridi)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "häviöllinen"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4123,14 +4206,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF-dekooderi"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF-asetukset</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Älä huomioi tiedoston ilmoittamaa kestoa"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML jaettavat soittolistat (XSPF)"
diff --git a/po/fr.po b/po/fr.po
index b8efacb..a2f5a1e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Trans-fr, 2012-2013
+# French language coordinator <yahoe.001@gmail.com>, 2012-2013
+# French language coordinator <yahoe.001@gmail.com>, 2016
 # Oxayotl <jagw40k@free.fr>, 2013-2014
 # Oxayotl <jagw40k@free.fr>, 2011-2012
 # Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011
-# Trans-fr, 2015
-# Trans-fr, 2013-2015
+# French language coordinator <yahoe.001@gmail.com>, 2015
+# French language coordinator <yahoe.001@gmail.com>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-10-10 21:38+0000\n"
-"Last-Translator: Trans-fr\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-16 19:07+0000\n"
+"Last-Translator: French language coordinator <yahoe.001@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/jlindgren/audacious/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -24,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Décodeur AAC (brut)"
 
@@ -32,20 +33,20 @@ msgstr "Décodeur AAC (brut)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Lecteur AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "séquencé"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Définir l'alarme..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +56,7 @@ msgstr ""
 "\n"
 "Développé à l'origine par Adam Feakin et Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -150,147 +151,147 @@ msgstr ""
 "Afficher un pense-bête durant l'alarme. Le saisir dans\n"
 "le champ et cocher la case pour qu'il soit affiché."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ceci est votre réveil."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Votre pense-bête pour aujourd'hui est…"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Pense-bête"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Heure"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarme à (par défaut) :"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silencieux après :"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "heures"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutes"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Choisir les jours où l'alarme se déclenche"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Jour"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Jours"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Fondu"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "secondes"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Commencer à"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Finir à"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actuel"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Commande additionnelle"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "activer"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Liste de lecture (optionnelle)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Choisir une liste de lecture"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Options"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Que signifient ces options ?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Aide"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Illustration"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sortie ALSA"
 
@@ -332,11 +333,11 @@ msgstr "Canal de mélange audio :"
 msgid "Mixer element:"
 msgstr "Mélangeur :"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Lecteur MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -378,68 +379,68 @@ msgstr ""
 "Tony Vroon\n"
 "pour son aide appréciée durant les tests alpha"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Remplacer le gain par défaut :"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Remplacer la polyphonie par défaut :"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Remplacer la réverbération par défaut :"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Marche"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Remplacer le refrain par défaut :"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Lecture</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposer :"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "demi-tons tempérés"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Décalage des percussions :"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numéros de note"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Ignorer le silence d'ouverture"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ignorer le silence de fermeture"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthétiseur</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Fréquence de l'échantillon :"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -447,86 +448,106 @@ msgstr "Fréquence de l'échantillon :"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - choix du fichier SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nom de fichier"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Taille (octets)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Infos MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format :"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Durée (ms) :"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Nombre de pistes :"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM :"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg) :"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Division du temps :"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Commentaires et paroles MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* aucun commentaire proposé dans ce fichier MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aucune parole proposée dans ce fichier MIDI"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 invalide)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Navigateur Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Navigateur Ampache\n"
+"\n"
+"Client Ampache pour Audacious.\n"
+"\n"
+"Licence : GNU GPLv3\n"
+"Tous droits réservés © Róbert Čerňanský et John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -545,7 +566,7 @@ msgstr ""
 "Basé en partie sur la bibliothèque Ghosd de Evan Martin :\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Affichage à l'écran)"
 
@@ -582,8 +603,8 @@ msgstr "Changement de titre"
 #: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
-"Déclenche l'affichage à l'écran lorsque le titre du morceau change (pour les "
-"flux Internet) :"
+"Déclenche l'affichage à l'écran lorsque le titre de la pièce change (pour "
+"les flux Internet) :"
 
 #: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
@@ -602,94 +623,94 @@ msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 "Déclenche l'affichage à l'écran lorsque la pause de lecture eest désactivée."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Décalage horizontal X :"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Décalage vertical Y :"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Largeur maximale d'affichage à l'écran :"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Options pour moniteurs multiples"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Affichage à l'écran avec :"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "tous les moniteurs"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "le moniteur %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Durée (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Affichage :"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Fondu d'entrée :"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Fondu de sortie :"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Police %i :"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Ombre"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Style du rendu"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Couleur %i :"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Activer le déclencheur"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Événement"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Gestionnaire composite détecté"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -700,60 +721,56 @@ msgstr ""
 "veuillez activer un gestionnaire composite sinon l'affichage à l'écran ne "
 "fonctionnera pas correctement."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "La fausse transparence ne nécessite pas de gestionnaire composite."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Fausse transparence"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Véritable transparence (nécessite l'extension composite de X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "L'extension composite n'est pas chargée"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "L'extension composite n'est pas proposée"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Affichage à l'écran Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Arrangement"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texte"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Décoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Options diverses"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -769,11 +786,11 @@ msgstr "Listes de lecture ASXv1 et ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listes de lecture au format Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Couleur</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Oscilloscope flou"
 
@@ -797,15 +814,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Fréquence de coupure :"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analyseur de spectre"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Greffon CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -827,120 +844,120 @@ msgstr ""
 "\n"
 "Ceci était un projet Google « Summer of Code » de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Lecteur</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Vitesse de lecture :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Forcer le lecteur :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Métadonnées</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Utiliser CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Utiliser CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utiliser HTTP à la place de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Chemin :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Échec de l'initialisation du sous-système cdio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s invalide."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
-msgstr "Piste %d non trouvée."
+msgstr "La piste %d est introuvable."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La piste %d en est une de données."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Erreur de lecture du CD audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Échec de l'ouverture du lecteur de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Aucun lecteur de CD audio n'a été trouvé."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "N'a pu finir d'initialiser le lecteur CD ouvert."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Échec de la récupération du premier et/ou du dernier numéro de piste"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 "Impossible de lire le numéro de secteur logique (LSN) de début ou de fin "
 "pour la piste %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Échec de la connexion à CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Échec de la requête auprès du serveur CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Échec de la requête auprès du serveur CDDB : %s ."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Échec de la lecture des informations cddb : %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Le lecteur est vide"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Type de disque non pris en charge."
 
@@ -1011,7 +1028,7 @@ msgstr "Écho :"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Durée par défaut du morceau :"
+msgstr "Durée par défaut de la pièce :"
 
 #: src/console/plugin.cc:42 src/modplug/plugin_main.cc:62
 msgid "<b>Resampling</b>"
@@ -1073,7 +1090,7 @@ msgstr "<b>Fondu enchaîné</b>"
 
 #: src/crossfade/crossfade.cc:48
 msgid "On automatic song change"
-msgstr "Lors d'un changement automatique de morceau"
+msgstr "Lors d'un changement automatique de pièce"
 
 #: src/crossfade/crossfade.cc:50 src/crossfade/crossfade.cc:56
 msgid "Overlap:"
@@ -1081,7 +1098,7 @@ msgstr "Recouvrement:"
 
 #: src/crossfade/crossfade.cc:54
 msgid "On seek or manual song change"
-msgstr "Lors d'un positionnement ou d'un changement manuel de morceau"
+msgstr "Lors d'un positionnement ou d'un changement manuel de pièce"
 
 #: src/crossfade/crossfade.cc:60
 msgid "<b>Tip</b>"
@@ -1111,58 +1128,60 @@ msgstr "Intensité :"
 msgid "Crystalizer"
 msgstr "Cristalliseur "
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Greffon des fichiers .cue"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Supprimer les fichiers"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Erreur lors du déplacement de %s vers la corbeille : %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Erreur lors de la suppression de %s : %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Erreur lors de la suppression de %s : n'est pas un fichier local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Voulez-vous déplacer les fichiers sélectionnés vers la corbeille ?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Déplacer vers la corbeille"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Voulez-vous supprimer définitivement les fichiers sélectionnés ?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Supprimer les fichiers sélectionnés"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Méthode de suppression</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Déplacer vers la corbeille au lieu de supprimer immédiatement"
 
@@ -1204,11 +1223,11 @@ msgstr "Volume :"
 msgid "Echo"
 msgstr "Écho"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Greffon FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1224,15 +1243,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Greffon FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Choisir un dossier"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1262,194 +1277,278 @@ msgstr ""
 "même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Format du fichier de sortie :"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Enregistrer dans le répertoire d'origine"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Enregistrer dans un répertoire personnalisé :"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Générer le nom de fichier à partir de :"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nom original du fichier"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nom original du fichier (sans suffixe) "
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Balise originale du fichier"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Ajouter le numéro de la piste au début du nom du fichier"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Général"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8 000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11 025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12 000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16 000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22 050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24 000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32 000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44 100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48 000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Stéréo combinée"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Qualité de l'algorithme :"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Fréquence de sortie de l'échantillon :"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "DBV"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "DBM"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Rapport débit binaire / compression :"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Qualité de l'algorithme :"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Débit binaire (kbps)"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Débit binaire :"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Taux de compression :"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Mode audio :"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Divers :"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Respecter rigoureusement les normes ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Protection contre les erreurs"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualité"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
-msgstr "Activer DBV/DBM (débit binaire variable/débit binaire moyen)"
+msgstr "Activer DBV/DBM"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Type :"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Options DBV :"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Débit binaire minimal :"
+
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Débit binaire maximal :"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Débit binaire minimal (kbps) :"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Débit binaire moyen :"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Débit binaire maximal (kbps) :"
+#: src/filewriter/filewriter.cc:519
+msgid "VBR quality level:"
+msgstr "Niveau de qualité DBV :"
 
-#: src/filewriter/mp3.cc:859
+#: src/filewriter/filewriter.cc:523
 msgid "Strictly enforce minimum bitrate"
 msgstr "Forcer de manière stricte le débit binaire minimal"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Options DBM :"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Débit binaire moyen (kbps) :"
-
-#: src/filewriter/mp3.cc:903
-msgid "VBR quality level:"
-msgstr "Niveau de qualité DBV (débit binaire variable) :"
-
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
-msgstr "Omettre l'en-tête DBV (débit binaire variable) Xing"
+msgstr "Omettre l'en-tête DBV Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "DBV/DBM (débit binaire variable/débit binaire moyen)"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>En-tête de trame</b>"
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Paramètres de trame :"
-
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marquer comme soumis aux droits d'auteur"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marquer comme originale"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Paramètres ID3 :"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Balises ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forcer l'ajout de la version 2 des balises"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Ajouter uniquement la version 1 des balises"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Ajouter uniquement la version 2 des balises"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualité"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "DBV/DBM (débit binaire variable/débit binaire moyen)"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Balises"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Niveau de qualité (0 - 10) :"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Qualité (0-1) :"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Général"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Décodeur FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
-msgstr "sans perte"
+msgstr "Sans perte"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1461,7 +1560,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1469,19 +1568,19 @@ msgstr ""
 "Greffon GIO pour Audacious\n"
 "Tous droits réservés © 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Greffon GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Le mode lecture-et-ajout n'est pas pris en charge"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Mode d'ouverture invalide"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1501,32 +1600,10 @@ msgstr ""
 "\n"
 "Licence : GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analyseur de spectre utilisant OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analyseur de spectre OpenGL pour Audacious\n"
-"Tous droits réservés © 2013 Christophe Budé, John Lindgren et Carlo Bramini\n"
-"Tous droits réservés © 2014 William Pitcock\n"
-"\n"
-"Basé sur le greffon XMMS :\n"
-"Tous droits réservés © 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, et 4Front Technologies\n"
-"\n"
-"Licence : GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Raccourcis de GNOME"
@@ -1547,8 +1624,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Numéro de l'entrée"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titre"
@@ -1605,8 +1682,8 @@ msgstr "Colonnes proposées :"
 msgid "Displayed columns"
 msgstr "Colonnes affichées"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Outil de recherche"
 
@@ -1634,335 +1711,338 @@ msgstr "Séparer"
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Ouvrir des fichiers..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Ouvrir une _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Ajouter des fichiers..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Ajouter une U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Rechercher dans _l'audiothèque"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "À propos _de..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Paramètres..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Lire"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Arrêt"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Pré_cédent"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "S_uivant"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Répéter"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Lecture _aléatoire"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Lecture aléatoire par albu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_Ne pas avancer dans la liste de lecture"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
-msgstr "Arrêter après ce morceau"
+msgstr "Arrêter après cette pièce"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
-msgstr "_Infos sur le morceau..."
+msgstr "_Infos sur la pièce..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Sauter à la _position... (temps)"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
-msgstr "Sauter au _morceau..."
+msgstr "Sauter vers une _piste..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Point de répétition _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Point de répétition _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Effacer les points de répétition"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Par _titre"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Par chemin de _fichier"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Par _chemin de fichier"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Par _numéro de piste"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Par _artiste"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Par al_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Par Artiste de l'albu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Par _date de parution"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Par _Genre"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Par _durée"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Par chemin de _fichier"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Par _titre personnalisé"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Ordre i_nversé"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Ordre _aléatoire"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Lire/Reprendre"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Rafraîchir"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Trier la sé_lection"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Enlever les _doublons"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Retirer les fichiers _manquants"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nouvelle"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Re_nommer..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Enle_ver"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importer"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exporter"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Gestionnaire de listes de lecture..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Gestionnaire de file d'_attente..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Augmenter le _volume"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Réduire le volume"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "É_galiseur ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_ffets..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "En_registrer le flux"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "_Paramètres audio ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Afficher la barre de _menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Afficher la barre d'i_nfos"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Afficher la vis_ualisation « Barre d'infos »"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Afficher la _barre d'état"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Afficher le temps _restant"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualisations..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "L_iste de lecture"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Services"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Sortie"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Affichage"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Ajouter / retirer de la file d'attente"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le dossier conteneur"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Rafraîchir la sélection"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Cou_per"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copier"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Coller"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Copier à la _fin"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Sélectionner _tout"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Renommer…"
 
@@ -2001,70 +2081,69 @@ msgstr "Positionnement avec les flèches :"
 
 #: src/gtkui/settings.cc:50
 msgid "Scroll on song change"
-msgstr "Déplacer vers le morceau en cours"
+msgstr "Déplacer vers la pièce en cours"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Mise en mémoire tampon..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canaux"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Mode « Fichier unique »."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Mode « Liste de lecture »."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
-msgstr "Arrêter après le morceau."
+msgstr "Arrêter après la pièce"
 
 #: src/hotkey/gui.cc:71
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Lire"
 
@@ -2072,8 +2151,8 @@ msgstr "Lire"
 msgid "Pause/Resume"
 msgstr "Pause/Reprise"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Arrêt"
 
@@ -2123,7 +2202,7 @@ msgstr "Activer/désactiver la lecture aléatoire"
 
 #: src/hotkey/gui.cc:86
 msgid "Toggle stop after current"
-msgstr "Activer/désactiver l'arrêt après le morceau en cours"
+msgstr "Activer/désactiver l'arrêt après la pièce en cours"
 
 #: src/hotkey/gui.cc:87
 msgid "Raise player window(s)"
@@ -2174,7 +2253,7 @@ msgstr "<b>Association de touches :</b>"
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Raccourcis universels"
 
@@ -2205,26 +2284,26 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Sortie JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Se connecter automatiquement aux ports de sortie"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Seulement %d ports de sortie JACK ont été trouvés mais sont %d sont exigés."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Erreur lors de la connexion au port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2233,12 +2312,12 @@ msgstr ""
 "la profondeur de sortie binaire pour « virgule flottante » dans les "
 "paramètres d'Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 "Échec lors de la connexion au serveur JACK ; est-il en cours d'exécution ?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2343,48 +2422,48 @@ msgstr "Se reconnecter automatiquement au serveur LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Attendre avant de se reconnecter :"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Greffon LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Aucune parole proposée"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Erreur"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Impossible d'analyser %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Recherche de paroles …"
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
-msgstr "Métadonnées de morceau manquantes"
+msgstr "Les métadonnées de la pièce sont manquantes"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Connexion à lyrics.wikia.com …"
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Modifier les paroles ..."
 
@@ -2396,17 +2475,17 @@ msgstr "Listes de lecture M3U"
 msgid "Tact Generator"
 msgstr "Métronome"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Métronome : %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Métronome : %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2561,15 +2640,15 @@ msgstr "Ces paramètres prendront effet lorsque Audacious sera redémarré."
 msgid "MPG123 Plugin"
 msgstr "Greffon MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avancé</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Utiliser un calcul précis de durée (lent)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Son ambiophonique"
 
@@ -2581,35 +2660,35 @@ msgstr "Serveur MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Greffon HTTP/HTTPS neon"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erreur lors de l'analyse de la redirection"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erreur HTTP inconnue"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Erreur lors de l'analyse de l'URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Trop de redirections"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious est inactif."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notifications du bureau"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2646,15 +2725,15 @@ msgstr ""
 "Vous devriez avoir reçu une copie de la Licence Publique Générale GNU en "
 "même temps que ce programme. Sinon, voir <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Permettre le contrôle d'Audacious depuis les notifications."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Rendre les notifications persistantes."
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Inclure le nom de l'album dans la notification"
 
@@ -2662,21 +2741,21 @@ msgstr "Inclure le nom de l'album dans la notification"
 msgid "Show"
 msgstr "Afficher"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pause"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Suivant"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Sortie OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Sortie OSS3"
 
@@ -2719,23 +2798,23 @@ msgstr ""
 "Tony Vroon and John Lindgren, et bien entendu les auteurs du précédent "
 "greffon OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gestionnaire de listes de lecture"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Entrées"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Ren_ommer"
 
@@ -2747,32 +2826,31 @@ msgstr "Listes de lecture PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Décodeur OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Sortie PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Greffon de sortie PulseAudio d'Audacious\n"
 "\n"
-"Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le "
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
 "modifier selon les termes de la Licence Publique Générale GNU telle que "
 "publiée par la « Free Software Foundation », en utilisant la version 2 de "
 "celle-ci, ou une version ultérieure (à votre discrétion).\n"
@@ -2786,11 +2864,11 @@ msgstr ""
 "même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Sortie QtMultimédia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2804,47 +2882,73 @@ msgstr ""
 "Basé sur le greffon de sortie SDL pour Audacious\n"
 "Tous droits réservés © 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analyseur de spectre OpenGL pour Audacious\n"
+"Tous droits réservés © 2013 Christophe Budé, John Lindgren et Carlo Bramini\n"
+"Tous droits réservés © 2014 William Pitcock\n"
+"\n"
+"Basé sur le greffon XMMS :\n"
+"Tous droits réservés © 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, et 4Front Technologies\n"
+"\n"
+"Licence : GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Je travaille..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informations"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Ouvrir un dossier..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Ajouter un dossier..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Inspecteur de journaux..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Fichiers ouverts"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Ajouter des fichiers"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Répéter"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Lecture aléatoire"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Ouvrir un dossier..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Ajouter un dossier..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Inspecteur de journaux..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
@@ -2888,7 +2992,7 @@ msgstr "<b>Conversion</b>"
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Taux :"
 
@@ -2940,61 +3044,49 @@ msgstr "176,4 kHz :"
 msgid "192 kHz:"
 msgstr "192 kHz :"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobble pour l'utilisateur : %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permission refusée."
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Vérification de l'accès à Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accéder au lien suivant pour permettre à Audacious de scrobbler vos "
-"lectures :"
+"Vos scrobbles sont enregistrés temporairement sur votre ordinateur. Ils "
+"seront transmis dès qu'Audacious sera autorisé à accéder au service."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Garder cette fenêtre ouverte et cliquer sur « Vérifier les permissions » de "
-"nouveau.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Permission accordée. Scrobblage pour l'utilisateur %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Pas d'inquiétude. Vos scrobbles sont sauvegardés sur votre ordinateur.\n"
-"Ils seront transmis dès qu'Audacious en aura la permission."
+"Permission refusée. Ouvrez l'URL suivante dans un navigateur, autorisez "
+"l'accès à votre compte à Audacious, puis cliquez sur « Vérifier la "
+"permission » de nouveau : "
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problème de réseau."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Contacter Last.fm a posé un problème."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Il a eu un problème lors du contact de Last.fm. Ressayer plus tard."
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Vérifier la permission"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Vérification..."
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Révoquer la permission"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Véri_fier les permissions"
-
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Révoquer les permissions"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Vous devez autoriser Audacious à scrobbler vos pistes vers votre compte Last."
-"fm.\n"
+"Vous devez autoriser Audacious à scrobbler des pistes vers votre compte Last."
+"fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3027,7 +3119,7 @@ msgstr ""
 "ce projet.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3036,11 +3128,11 @@ msgstr ""
 "fm. \n"
 "Veuillez vérifier les propriétés du greffon Scrobbler 2.0."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Sortie SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3048,58 +3140,58 @@ msgstr ""
 "Greffon de sortie SDL pour Audacious\n"
 "Tous droits réservés © 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Audiothèque"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d résultat"
 msgstr[1] "%d résultats"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d caché)"
 msgstr[1] "(%d cachés)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr[0] "%d morceau"
-msgstr[1] "%d morceaux"
+msgstr[0] "%d pièce"
+msgstr[1] "%d pièces"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "de ce genre"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "sur"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "par"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Créer une liste de lecture"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Ajouter à la liste de lecture"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Rechercher dans l'audiothèque"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3107,11 +3199,11 @@ msgstr ""
 "Pour importer votre audiothèque dans Audacious, choisissez un dossier et "
 "cliquez ensuite sur l'icône de rafraîchissement."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Veuillez patienter…"
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Choisir un dossier"
 
@@ -3161,7 +3253,7 @@ msgstr "Définir une durée maximale de lecture :"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr "À n'utiliser que si la longueur du morceau est inconnue"
+msgstr "À n'utiliser que si la longueur de la pièce est inconnue"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
@@ -3169,15 +3261,15 @@ msgstr "Définir une durée minimum de lecture :"
 
 #: src/sid/xs_config.cc:96
 msgid "<b>Subtunes</b>"
-msgstr "<b>Sous-morceaux</b>"
+msgstr "<b>Sous-pièces</b>"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr "Activer les sous-morceaux"
+msgstr "Activer les sous-pièces"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr "Ignorer les sous-morceaux plus courts que :"
+msgstr "Ignorer les sous-pièces plus courtes que :"
 
 #: src/sid/xs_config.cc:105
 msgid "<b>Note</b>"
@@ -3207,15 +3299,15 @@ msgstr "Seuil :"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Points de répétition effacés."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Point de répétition A activé."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Point de répétition B activé."
 
@@ -3267,373 +3359,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Égaliseur d'Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Se positionner à %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume : %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance : %d%% gauche"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance : centre"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance : %d%% droite"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu des options"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Désactiver « Toujours au premier plan »"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Activer « Toujours au premier plan »"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Boîte d'Infos sur le fichier"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Taille double"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualisations"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Enregistrement activé"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Enregistrement désactivé"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Augmenter le volume"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Réduire le volume"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Effets ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Enregistrer le flux"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Paramètres audio ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Ouvrir les fichiers..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Ouvrir l'URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Rechercher dans l'audiothèque"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Lecture"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Sortie"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Affichage"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Services"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "À propos..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Paramètres..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
-msgstr "Infos sur le morceau..."
+msgstr "Infos sur la pièce..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Lecture aléatoire par album"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
-msgstr "Arrêter après ce morceau"
+msgstr "Arrêter après cette pièce"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Définir une répétition A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Effacer la répétition A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
-msgstr "Sauter au morceau..."
+msgstr "Sauter vers une piste..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Sauter à la positon (temps)…"
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Lire/Reprendre"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Renommer la liste de lecture..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Enlever la liste de lecture"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Liste de lecture précédente"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Liste de lecture suivante"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importer la piste de lecture..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exporter la liste de lecture..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Gestionnaire de listes de lecture..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Gestionnaire de file d'attente..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Rafraîchir la liste de lecture"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Montrer l'éditeur de liste de lecture"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Montrer l'égaliseur"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Afficher le temps restant"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Toujours au premier plan"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Sur tous les espaces de travail"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Enrouler le lecteur"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Enrouler l'éditeur de listes de lecture"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Enrouler l'égaliseur"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Ajouter une URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Ajouter des fichiers..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Par titre"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Par nom de fichier"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Par chemin de fichier"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Tout enlever"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Vider la file d'attente"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Retirer les fichiers manquants"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Enlever les doublons"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Ne garder que la sélection"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Enlever la sélection"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Chercher et sélectionner"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Ne rien sélectionner"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Par numéro de piste"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Par artiste"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Par album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Par artiste de l'album"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Par date de parution"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Par Genre"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Par durée"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Par titre personnalisé"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
-msgstr "Mélange aléatoirement la liste"
+msgstr "Mélange aléatoire de la liste"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Inverser la liste"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Trier la sélection"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Ouvrir le dossier conteneur"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Couper"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copier"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Coller"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Copier à la fin"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Mettre/enlever de la file d'attente"
 
@@ -3646,15 +3746,15 @@ msgstr "Éditeur de liste de lecture d'Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d sur %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface Winamp Classic"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Ouvrir un dossier ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Ajouter un dossier ..."
 
@@ -3688,7 +3788,7 @@ msgstr "Utiliser des polices bitmap (seul ASCII est pris en charge)"
 
 #: src/skins-qt/skins_cfg.cc:214 src/skins/skins_cfg.cc:196
 msgid "Scroll song title"
-msgstr "Faire défiler le titre du morceau"
+msgstr "Faire défiler le titre de la pièce"
 
 #: src/skins-qt/skins_cfg.cc:216 src/skins/skins_cfg.cc:198
 msgid "Scroll song title in both directions"
@@ -3742,7 +3842,7 @@ msgid "Slow"
 msgstr "Lente"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Moyenne"
 
@@ -3880,7 +3980,7 @@ msgstr "Créer une nouvelle liste de lecture à partir des entrées trouvées"
 msgid "Sndfile Plugin"
 msgstr "Greffon Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3920,62 +4020,62 @@ msgstr ""
 "même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sortie sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Périphérique (vide pour celui par défaut) :"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Enregistrer et restaurer le volume :"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Erreur sndio : format audio non pris en charge (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Erreur sndio : échec de sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Erreur sndio : échec de sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Erreur sndio : échec de sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
-msgstr "Changement de morceau"
+msgstr "Changement de pièce"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Commandes</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
-msgstr "Commande à exécuter lorsqu'un nouveau morceau commence :"
+msgstr "Commande à exécuter lorsqu'une nouvelle pièce commence :"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
-msgstr "Commande à exécuter lorsqu'un morceau se termine :"
+msgstr "Commande à exécuter lorsqu'une nouvelle pièce se termine :"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Commande à exécuter à la fin de la liste de lecture :"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
-"Commande à exécuter lorsque le titre d'un morceau change (pour les flux "
+"Commande à exécuter lorsque le titre d'une pièce change (pour les flux "
 "réseau) :"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3984,7 +4084,7 @@ msgstr ""
 "avant d'exécuter la commande (totalement inutile pour la commande de fin de "
 "liste de lecture) :"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -4010,7 +4110,7 @@ msgstr ""
 "%t : Position de la liste de lecture\n"
 "%T : Titre (non formaté)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4018,15 +4118,15 @@ msgstr ""
 "Les paramètres passés à la ligne de commande devraient être mis entre \" \". "
 "Ne pas le faire pourrait entraîner des résultats inattendus."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
-msgstr "Infos sur le morceau"
+msgstr "Infos sur la pièce"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Ré-échantillonneur SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4040,43 +4140,43 @@ msgstr ""
 "Basé sur le greffon de conversion du taux d'échantillonnage :\n"
 "Tous droits réservés © 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rapide"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Bas"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Haut"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Très haut"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualité :"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Vitesse et hauteur"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Vitesse et hauteur</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Hauteur :"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icône d'état"
 
@@ -4144,7 +4244,7 @@ msgstr "Changer le volume"
 
 #: src/statusicon/statusicon.cc:381
 msgid "Change playing song"
-msgstr "Changer le morceau en cours"
+msgstr "Changer la pièce en cours"
 
 #: src/statusicon/statusicon.cc:384
 msgid "<b>Other Settings</b>"
@@ -4152,7 +4252,7 @@ msgstr "<b>Autres paramètres</b>"
 
 #: src/statusicon/statusicon.cc:385
 msgid "Disable the popup window"
-msgstr "Désactiver la fenêtre contextuelle"
+msgstr "Désactiver la fenêtre contextuelle"
 
 #: src/statusicon/statusicon.cc:389
 msgid "Advance in playlist when scrolling upward"
@@ -4180,12 +4280,12 @@ msgstr "<b>Stéréo additionnelle</b>"
 msgid "Tone Generator"
 msgstr "Générateur de fréquences musicales"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Générateur de tonalités : "
 
@@ -4209,7 +4309,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Suppression des voix"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4286,7 +4386,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Décodeur VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4296,19 +4396,31 @@ msgstr ""
 "Basé sur in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\n"
 "Greffon Audacious par Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Greffon win32 waveOut pour Audacious\n"
+"Tous droits réservés © 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Décodeur WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr " avec perte (hybride)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "avec perte"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4322,32 +4434,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Décodeur 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuration XFS</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorer la durée donnée par le fichier"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listes de lecture XSPF"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Le fondu enchaîné a échoué car les morceaux avaient un nombre différents "
-#~ "de canaux.  Tu peux utiliser le « Mélangeur de canaux » pour les "
-#~ "uniformiser."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Le fondu enchaîné a échoué car les morceaux avaient des taux "
-#~ "d’échantillonnage différents. Tu peux utiliser le « Convertisseur de taux "
-#~ "d’échantillonnage » pour les uniformiser."
diff --git a/po/gl.po b/po/gl.po
index 97f0587..171d7e6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# antiparvos <marcoslansgarza@gmail.com>, 2014-2015
+# antiparvos <marcoslansgarza@gmail.com>, 2014-2016
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012,2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-29 04:50+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: antiparvos <marcoslansgarza@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/jlindgren/audacious/"
 "language/gl/)\n"
@@ -23,28 +23,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
-msgstr "Decodificador AAC (en bruto)"
+msgstr "Descodificador AAC (en bruto)"
 
 #: src/adplug/adplug-xmms.cc:42
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "secuenciado"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Estabelecer a alarma ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Escrito orixinalmente por Adam Feakin e Stodden Daniel."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -153,147 +153,147 @@ msgstr ""
 "     escriba o recordatorio na caixa e active o\n"
 "     botón para que sexa amosado."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Esta é a súa chamada de atención."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "O seu recordatorio para hoxe é..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Lembranza"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "luns"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "martes"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "mércores"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "xoves"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "venres"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Hora"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarma as (predeterminado):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silencio despois de:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Seleccione os días para que salte a alarma"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Día"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Esvaecemento"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Inicial"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Actual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Orde adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de reprodución (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Escolla a lista de reprodución"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opcións"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Que significan estas opcións?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Axuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Portada"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
@@ -335,11 +335,11 @@ msgstr "Dispositivo mesturador:"
 msgid "Mixer element:"
 msgstr "Elemento mesturador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Engadido AMIDI (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -381,68 +381,68 @@ msgstr ""
 "Tony Vroon\n"
 "pola gran axuda coas probas da alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Anular a ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Anular a polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Anular a reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Acender"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Anular o coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reprodución</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposición:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitóns"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Omitir o silencio principal"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Omitir o silencio posterior"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>Fonte de son</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetizador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Taxa da mostraxe:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -450,86 +450,106 @@ msgstr "Taxa da mostraxe:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Engadido AMIDI - seleccione un ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Información MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Duración (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Num. de pistas"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variábel"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div. tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\\\"smaller\\\"> Comentarios e letras MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* non hai comentarios dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* non hai letras dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Pechar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 incorrecto)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Explorador de Ampache\n"
+"\n"
+"Cliente de Ampache para Audacious.\n"
+"\n"
+"Licenza: GNU GPLv3\n"
+"Dereito de autor (C) Róbert Čerňanský e John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -548,7 +568,7 @@ msgstr ""
 "Baseado parcialmente na biblioteca Ghosd de Evan Marti:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Información en pantalla)"
 
@@ -605,94 +625,94 @@ msgstr ""
 "Activa as notificacións OSD cando a reinicia a reprodución despois dunha "
 "pausa"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Desprazamento X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Desprazamento Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Largura máx. do OSD"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opcións de múltiple monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Amosar as notificacións OSD utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Esvaecemento de entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Esvaecemento de saída:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo de debuxado"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Actividade"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Detectouse un administrador de composición"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -702,61 +722,57 @@ msgstr ""
 "a non ser que saiba que ten un en execución, active un administrador de "
 "composición ou as notificacións OSD non funcionarán correctamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Para a falsa transparencia non fai falta un administrador de compòsición"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (require composición 3D)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "A extensión de composición non está cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "A extensión de composición non está dispoñíbel"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Notificacións OSD de Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Proba"
 
@@ -772,11 +788,11 @@ msgstr "Listas de reprodución ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodución do Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Cor</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Alcance do desenfoque"
 
@@ -800,15 +816,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Engadido de CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -829,118 +845,118 @@ msgstr ""
 "\n"
 "Este foi un proxecto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocidade de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Anular o dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadatos</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Empregar o CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Empregar a CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Empregar HTTP no canto de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Non foi posíbel iniciar o subsistema cdio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI incorrecto %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Non se atopa a pista %d"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A pista %d é unha pista de datos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Produciuse un erro ao ler o CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Non foi posíbel abrir o dispositivo do CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Non foi posíbel atopar unha unidade de CD de son."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Non foi posíbel rematar a inicialización da unidade de CD aberta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Non foi posibel obter o primeiro/último número de la pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Non é posíbel ler o inicio/fin LSN para a pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Non foi posíbel crear a conexión coa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Produciuse un erro ao consultar o servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Produciuse un erro ao consultar o servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Non foi posíbel ler a información de CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "A unidade está baleira."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco non admitido."
 
@@ -989,7 +1005,7 @@ msgid ""
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
-"Motor decodificador de m úsica na consola basaedo en Game_Music_Emu 0.5.2\n"
+"Motor descodificador de m úsica na consola basaedo en Game_Music_Emu 0.5.2\n"
 "Formatos admitidos: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
 "Engadido para Audacious por:\n"
@@ -1110,59 +1126,61 @@ msgstr "Intensidade:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Engadido de plano de referencia"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Eliminar ficheiros"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Produciuse un erro ao enviar %s ao lixo: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Produciuse un erro ao eliminar %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Produciuse un erro ao eliminar %s: non é un ficheiro local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Confirma que quere enviar ao lixo os ficheiros seleccionados?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Enviar ao lixo"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 "Confirma que quere eliminar permanentemente os ficheiros seleccionados?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Eliminar os ficheiros seleccionados"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Eliminar o método</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Enviar ao lixo no canto de eliminar inmediatamente"
 
@@ -1205,11 +1223,11 @@ msgstr "Volume:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Engadido FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1218,22 +1236,18 @@ msgid ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Engadido de decodificación multi-formato do son empregando\n"
+"Engadido de descodificación multi-formato do son empregando\n"
 "a infraestrutura multimedia FFmpeg (http://www.ffmpeg.org/)\n"
 "\n"
 "Engadido para Audacious por:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Engadido FileWrite"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Escolla un cartafol"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1264,194 +1278,278 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato do ficheiro de saída:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Gardar no directorio orixinal"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Gardar nun cartafol personalizado:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Xerar o nome de ficheiro desde:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nome do ficheiro orixinal"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nome do ficheiro orixinal (sen sufixo)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta do ficheiro orixinal"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Antepor o número de pista ao nome de ficheiro"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Xeral"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Estéreo solapado"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Calidade do algoritmo:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Frecuencia de mostraxe de saída:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de bits / Relación de compresión:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Calidade do algoritmo:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Taxa de bits (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Relación de compresión:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Modo do son:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Varios:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Forzar o cumprimento estrito da norma ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Protección contra erros"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Calidade"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opcións VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa de bits mínima (kbps)"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa de bits máxima (kbps)"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicar estritamente a taxa de bits mínima"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Taxa de bits mínima :"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opcións ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Taxa de bits máxima:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Taxa media de bits (kbps)"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Taxa media de bits:"
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nivel de calidade VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estritamente a taxa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omitir a cabeceira VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parámetros do cadro:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Cabeceiras das partes</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marcar con Dereitos de autoría"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marcar como orixinal"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Etiquetas ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forzar o engadido da etiqueta da versión 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Engadir só a etiqueta v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Engadir só a etiqueta v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Calidade"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidade (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Calidade (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Xeral"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sen perdas"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1463,7 +1561,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1471,19 +1569,19 @@ msgstr ""
 "Engadido GIO para Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Engadido GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "O modo ler e engadir non está admitido"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo incorrecto de apertura"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1503,32 +1601,10 @@ msgstr ""
 "\n"
 "Liceza: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analizador de espectro OpenGL para Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Baseado no engadido de XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
-"4Front Technologies\n"
-"\n"
-"Licencia: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Atallos do GNOME"
@@ -1549,8 +1625,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1607,8 +1683,8 @@ msgstr "Columnas dispoñíbeis"
 msgid "Displayed columns"
 msgstr "Columnas amosadas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Ferramenta de buscas"
 
@@ -1636,335 +1712,338 @@ msgstr "Desancorar"
 msgid "Disable"
 msgstr "Desactivar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Abrir ficheiros..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir un _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Engadir ficheiros..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Engadir un U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Buscar unha _fonoteca"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Axustes ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Saír"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Pausa"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Deter"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "A_nterior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Se_guinte"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Ao chou por álbu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzar na lista de reprodución"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Parar _despois desta canción"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Información da canción"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Saltar no _tempo"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Saltar á _canción"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Estabelecer o punto de repetición _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Estabelecer o punto de repetición _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Limpar os puntos de repetición"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Polo _título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Pola nome do _ficheiro"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Por _ruta do ficheiro"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Polo _número de pista"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Polo _interprete"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Polo interprete do álbu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Pola _data de publicación"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Por _xénero"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Por _duración"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Pola _ruta do ficheiro"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Polo título _personalizado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Orden _inversa"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "Re_producir/Continuar"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Ordenar a s_elección"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Retirar _duplicados"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Eliminar os ficheiros _non dispoñíbeis"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Cambiar o _nome..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Re_tirar"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Xestor da _lista de reprodución:"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Xestor da _cola"
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Subir o volume"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Baixar o volume"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Ecualizador ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fectos ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Gravar fluxo"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Axu_stes de son ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Amosar a barra de _menú"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Amosar a barra de i_nformación"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Amosar a barra de vis_ualización"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Amosar a barra de e_stado"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Amosar o tempo _restante"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualizacións ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de reprodución"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Saí_da"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Por na cola/retirar da cola"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "Abrir o cartafol _contedor"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Actualizar seleccionados"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "C_ortar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "P_egar ao final"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Cambiar o _nome..."
 
@@ -2005,58 +2084,57 @@ msgstr "As teclas de frecha buscan a través de:"
 msgid "Scroll on song change"
 msgstr "Avanzar ao cambiar de canción"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Almacenando no búfer..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canle"
 msgstr[1] "%d canles"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo da lista de reprodución"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Parar despois da canción."
 
@@ -2064,9 +2142,9 @@ msgstr "Parar despois da canción."
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproducir"
 
@@ -2074,8 +2152,8 @@ msgstr "Reproducir"
 msgid "Pause/Resume"
 msgstr "Pausar/Reiniciar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Parar"
 
@@ -2174,7 +2252,7 @@ msgstr "<b>Teclas asociadas:</b>"
 msgid "_Add"
 msgstr "_Engadir"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Teclas rápidas globais"
 
@@ -2205,25 +2283,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Conectar automaticamente os portos de saída"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Só se atoparon %d portos de saída de JACK, son necesarios %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Produciuse un fallo ao conectar co porto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2231,11 +2309,11 @@ msgstr ""
 "JACK só acepta son en punto flotante. Ten que cambiar o bit de profundidade "
 "da saída a punto flotante nos axustes do Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Produciuse un fallo ao conectar co servidor JACK; está en execución?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2339,48 +2417,48 @@ msgstr "Volver conectar co servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Agardar antes de volver conectar:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Engadido LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Non hai letras dispoñíbeis"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Erro"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Non é posibel obter %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Non é posíbel analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Faltan os metadatos da canción"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando con lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Editar as letras ..."
 
@@ -2392,17 +2470,17 @@ msgstr "Listas de reprodución M3U"
 msgid "Tact Generator"
 msgstr "Xerador de tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Xerador de tacto: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Xerador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2557,15 +2635,15 @@ msgstr "Estes axustes terán efecto após que Audacious sexa reiniciado."
 msgid "MPG123 Plugin"
 msgstr "Engadido MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avanzado</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Utilizar o cálculo de duración exacta (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Son envolvente"
 
@@ -2577,35 +2655,35 @@ msgstr "Servidor MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Engadido Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro de análise de redireccionamento"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP descoñecido"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Erro de análise de URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Demasiadas redireccións"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious non está a reproducir nada."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificacións de escritorio"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2641,15 +2719,15 @@ msgstr ""
 "Debería ter recibido unha copia da Licenza Pública Xeral de GNU xunto\n"
 "con este programa, de non ser así, consulte <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Amosar os controis de reprodución"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Amosar sempre a notificación"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Incluír o nome do álbum na notificación"
 
@@ -2657,21 +2735,21 @@ msgstr "Incluír o nome do álbum na notificación"
 msgid "Show"
 msgstr "Amosar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2713,23 +2791,23 @@ msgstr ""
 "Gustaríame darlle as grazas á xente de #audacious, sobre todo a Tony Vroon  "
 "e a John Lindgren e por suposto aos autores do anterior engadido de OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Xestor da lista de reprodución:"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Retirar"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Re_nomear"
 
@@ -2741,28 +2819,27 @@ msgstr "Listas de reprodución PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Engadido de saída PulseAudio para Audacious\n"
 "\n"
@@ -2781,11 +2858,11 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2799,47 +2876,73 @@ msgstr ""
 "Baseado no engadido de saída SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizador de espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Baseado no engadido de XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
+"4Front Technologies\n"
+"\n"
+"Licencia: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Traballando..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Información"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Busca"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Abrir o cartafol ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Engadir un cartafol ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Inspector do _rexistro ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Abrir ficheiros"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Engadir ficheiros"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Ao chou"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Abrir o cartafol ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Engadir un cartafol ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Inspector do _rexistro ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
@@ -2883,7 +2986,7 @@ msgstr "<b>Conversión</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2935,60 +3038,47 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Aceptar. Scrobbling para o usuario: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso denegado"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Comprobando o acceso a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Acceda á seguinte ligazón para permitirlle a Audacious enviar o rexistro das "
-"súas escoitas:"
+"Os seus «scrobbles» estanse gardando no computador temporalmente. Serán "
+"enviados tan pronto  como o Audacious teña permitido o acceso."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Manteña aberta esta xanela e prema outra vez en «Comprobación de permisos».\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Permiso concedido. Facendo «scrobbling» para o usuario %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"No se preocupe. Os seus rexistros de escoitas gardanse no seu computador.\n"
-"Só se enviarán se Audacious llelo permite."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema na rede."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Houbo un problema ao contactar con Last.fm. Ténteo de novo máis tarde."
+"Permiso rexeitado. Abra a seguinte URL nun navegador, permita que o "
+"Audacious teña acceso á súa conta e prema en «Comprobar permiso» de novo:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Comprobando..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Produciuse un problema contactando con Last.fm"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_omprobación de permisos"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Comprobar permiso"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar o permiso"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Revogar permiso"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Ten que autorizar a súa conta en Last.fm para que poida seguir (scrobble) as "
-"súas pistas.\n"
+"Debe permitir a Audacious facer «scrobble» ás pistas na conta de Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3019,7 +3109,7 @@ msgstr ""
 "Gracias a John Lindgren por botarme unha man no comenzo deste proxecto.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3027,11 +3117,11 @@ msgstr ""
 "Audacious está a empregar unha versión mellorada do Scrobbler de Last.fm .\n"
 "Comprobe as preferencias para o engadido do Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3039,58 +3129,58 @@ msgstr ""
 "Engadido SDL Output para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d agochado)"
 msgstr[1] "(%d agochados)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d canción"
 msgstr[1] "%d cancións"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "deste xénero"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "en"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "por"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Crear unha lista de reprodución"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Engadir á lista de reprodución"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Buscar unha fonoteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3098,11 +3188,11 @@ msgstr ""
 "Para importar a súa fonoteca en Audacious, escolla un cartafol e prema na "
 "icona «Actualizar»."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Agarde..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Escolla un cartafol"
 
@@ -3198,15 +3288,15 @@ msgstr "Limiar:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Repetir os puntos limpados"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Repetir o punto de axuste A."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Repetir o punto de axuste B."
 
@@ -3258,373 +3348,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ecualizador do Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% esquerda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balance: centro"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% dereita"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menú de opcións"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar «Sempre enriba»"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Activar «Sempre enriba»"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caixa de información do ficheiro"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dobre tamaño"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Vistas"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Iniciar gravación"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Parar gravación"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Subir volume"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Baixar volume"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efectos ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Gravar fluxo"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Axustes de son ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Abrir ficheiros ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Abrir un URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Buscar unha fonoteca"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reprodución"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Saída"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servizos"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Sobre ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Axustes ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Saír"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Información da canción ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Ao chou por álbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Non avanzar na lista de reprodución"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Deter despois desta canción"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Estabelecer a repetición A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Limpar a repetición A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Saltar á canción ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Saltar no tempo ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Reproducir/Continuar"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nova lista de reprodución"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Renomear a lista de reprodución ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Retirar a lista de reprodución"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Lista de reprodución anterior"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Seguinte lista de reprodución"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importar lista de reprodución ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportar lista de reprodución ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Xestor da lista de reprodución ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Xestor da cola ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Actualizar a lista"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Amosar o editor de listas de reprodución"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Amosar o ecualizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Amosar o tempo restante"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sempre enriba"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "En todos os espazos de traballo"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Enrolar o reprodutor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Enrolar o editor de listas de reprodución"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Enrolar o ecualizador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Engadir un URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Engadir ficheiros ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Polo título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Polo nome de ficheiro"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Pola ruta do ficheiro"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Retirar todo"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Limpar a cola"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Retirar os ficheiros non dispoñíbeis"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Retirar os duplicados"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Retirar os NON seleccionados"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Retirar os seleccionados"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Buscar e seleccionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverter a selección"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Non seleccionar nada"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Polo número de pista"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Polo interprete"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Polo álbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Polo interprete do álbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Pola data de publicación"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Por xénero"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Por duración"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Lista ao chou"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Lista inversa"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordenar os seleccionados"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenar a lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Abrir o cartafol contedor"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Pegar ao final"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Poñer na cola/Quitar da cola"
 
@@ -3637,15 +3735,15 @@ msgstr "Editor de listas de reprodución do Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface clásica do Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "_Abrir o cartafol ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "_Engadir un cartafol ..."
 
@@ -3733,7 +3831,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Medio"
 
@@ -3869,7 +3967,7 @@ msgstr "Crear unha nova lista de reprodución coas entradas coincidentes"
 msgid "Sndfile Plugin"
 msgstr "Engadido Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3910,61 +4008,61 @@ msgstr ""
 "Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (baleiro como predeterminado):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Gardar e restaurar o volume:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Produciuse un erro de Sndio: Formato de son non admitido (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Ordes</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Orde que executar cando comece unha nova canción:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Orde que executar na fin dunha canción:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Orde que executar na fin dunha lista de reprodución:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Orde que executar cando cambia o título dunha canción (para fluxos da rede):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3973,7 +4071,7 @@ msgstr ""
 "de executar a orde (non todos son útiles para a orde de fin de lista de "
 "reprodución):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3999,7 +4097,7 @@ msgstr ""
 "%t: Posición da lista de reprodución\n"
 "%T: Título (sen formatar)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4007,15 +4105,15 @@ msgstr ""
 "Os parámetros enviados á consola deben delimitarse con comiñas. Doutro xeito "
 "poden producirse resultados inesperados."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Información da canción"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4029,43 +4127,43 @@ msgstr ""
 "Baseado no engadido Sample Rate Converter:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Moi alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Calidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e ton"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidade e ton</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Ton:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icona de estado"
 
@@ -4169,12 +4267,12 @@ msgstr "<b>Extra estéreo</b>"
 msgid "Tone Generator"
 msgstr "Xerador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Xerador de tons: "
 
@@ -4197,7 +4295,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Supresión de voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4217,7 +4315,7 @@ msgid ""
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Decodificador Ogg Vorbis de Audacious\n"
+"Descodificador Ogg Vorbis de Audacious\n"
 "\n"
 "Basado no engadido Ogg Vorbis da Xiph.org Foundation:\n"
 "http://www.xiph.org/\n"
@@ -4274,7 +4372,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4285,19 +4383,31 @@ msgstr ""
 "Baseado no in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Engadido de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "waveOut  de Win32 "
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Engadido waveOut de Win32 para Audacious\n"
+"Dereitos de autor 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "con perdas (híbrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "con perdas"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4311,14 +4421,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuración XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorar a duración do ficheiro"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de reprodución XML compartíbel (XSPF)"
diff --git a/po/hu.po b/po/hu.po
index 84e0dbd..69d98a5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,16 +6,17 @@
 # Agócs Dániel <agocsdaniel@gmail.com>, 2015
 # Balázs Glatz <glatz.balazs@gmail.com>, 2015
 # Ferenc Szabo <szaboferee@gmail.com>, 2015
+# Gábor Sávolyi, 2016
 # Gergely Békési <bekesi.gergely@gmail.com>, 2014
 # Péter Polonkai <polesz@nedudu.hu>, 2010
-# Péter Polonkai <polesz@nedudu.hu>, 2011-2012,2014-2015
+# Péter Polonkai <polesz@nedudu.hu>, 2011-2012,2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-10-19 00:17+0000\n"
-"Last-Translator: Balázs Glatz <glatz.balazs@gmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-14 16:04+0000\n"
+"Last-Translator: Péter Polonkai <polesz@nedudu.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/jlindgren/audacious/"
 "language/hu/)\n"
 "Language: hu\n"
@@ -24,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Nyers) Dekóder"
 
@@ -32,20 +33,20 @@ msgstr "AAC (Nyers) Dekóder"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Lejátszó)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "soros"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Riasztás"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Riasztás beállítása ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +56,7 @@ msgstr ""
 "\n"
 "Eredetileg Adam Feakin és Daniel Stodden írta."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -151,147 +152,147 @@ msgstr ""
 "  Emlékeztető:\n"
 "    Ezt a szöveget jeleníti meg a program riasztáskor."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ez egy ébresztési hívás."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "A mai emlékeztető.."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Emlékeztető"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Hétfő"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Péntek"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Szombat"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Idő"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Riasztás (alapértelmezett):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Csendes ezután:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "óra"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "perc"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Válassza ki a riasztás napját a következőekből"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Nap"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Napok"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Felkeverés"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "másodperc"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Hangerő"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Kezdjük a"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Vége"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Jelenlegi"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "További parancs"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "engedélyez"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lejátszólista (opcionális)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Lejátszólista választása"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opciók"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Mit jelentenek ezek a lehetőségek?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Súgó"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Album borító"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA kimenet"
 
@@ -334,11 +335,11 @@ msgstr "Keverő eszköz:"
 msgid "Mixer element:"
 msgstr "Mixer elem:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Lejátszó)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -380,68 +381,68 @@ msgstr ""
 "Tony Vroon-nak\n"
 "a sok segítségért a tesztelésben"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Alapértelmezett erősítés felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Alapértelmezett polifónia felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Alapértelmezett visszhang felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Be"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Alapértelmezett kórus hatás felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Lejátszás</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transzponálás:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "félhangok"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Dob eltolás:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "hangjegy számok"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Csend levágása az elején"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Csend levágása a végén"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont köyvtárak</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Szintetizátor</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Mintavételi frekvencia:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -449,86 +450,105 @@ msgstr "Mintavételi frekvencia:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont fájl választás"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Mégsem"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Méret (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Név"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Információ </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formátum:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Hossz (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Sáv sorszáma:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "változó"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Kezdeti idő"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Megjegyzések és Dalszövegek </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* nem található megjegyzés ehhez a MIDI fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* nem található dalszöveg ehhez a MIDI fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Bezár"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (érvénytelen UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache Böngésző"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache Böngésző\n"
+"Ampache kliens az Audacioushoz.\n"
+"\n"
+"Licence: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -546,7 +566,7 @@ msgstr ""
 "Részben Evan Martin Ghosd könyvtára alapján:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -598,94 +618,94 @@ msgstr "Szünet Ki"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD használata ha elindítják a lejátszást."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Elhelyezés"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relatív X pozíció:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relatív Y pozíció:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Max OSD szélesség:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Több monitoros opciók"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD képernyők használata:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "minden monitoron"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Időtartam (mp)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Képernyő:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Áttűnés be:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Áttűnés ki:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Betűkészlet %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Árnyék"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Renderelési stílus"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Színek"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Szín %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Esemény engedélyezése"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Kompozit kezelő detektálva"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -695,60 +715,56 @@ msgstr ""
 "ha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az "
 "OSD nem fog megfelelően működni"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Kompozít kezelő nem szükséges a nem valódi átlátszósághoz"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Átlátszóság"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Nem valódi átlátszóság"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Valódi átlászóság (szükséges X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Kompozit kiterjesztés nem tölthető be"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozit kiterjesztés nem érhető el"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Pozíció"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animáció"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekoráció"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Teszt"
 
@@ -764,11 +780,11 @@ msgstr "ASXv1/ASXv2 lejátszólisták"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious lejátszólisták (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Szín</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Szolid szkóp"
 
@@ -792,15 +808,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Vágási frekvencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektrum analizátor"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD bővítmény"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -823,118 +839,118 @@ msgstr ""
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Eszköz</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Olvasási sebesség:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Eszköz felülírása:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metaadat</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "CD-Text használata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB használata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Hasznájon HTTP helyett CDDBP protokollt"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Elérési út:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "A cdio alrendszer inicializálása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Érvénytelen URI: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "%d sáv nem található."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Ez adatsáv: %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Hiba az audio CD olvasásakor."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "A CD eszköz %s megnyitása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Nincs hanglemez-képes CD maghajtó."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "A megnyitott CD meghajtó inicializálása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Az első/utolsó sáv számának lekérdezése sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Az LSN eleje/vége nem olvasható a %d. sávon."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Sikertelen a cddb kapcsolat létrehozása."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "A CDDB kiszolgáló lekérdezése sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "A CDDB kiszolgáló lekérdezése sikertelen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "A CDDB infó olvasása sikertelen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "A meghajtó üres."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nem támogatott lemez típus."
 
@@ -1105,58 +1121,60 @@ msgstr "Intenzitás:"
 msgid "Crystalizer"
 msgstr "Kristályosító"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Lista Bővítmény"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Fájlok törlése"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Hiba %s törlésekor: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Hiba a törléskor %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Hiba %s törlésekor: nem helyi fájl."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Törli a kiválasztott fájlokat?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Kukába helyez"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Véglegesen törli a kiválasztott fájlokat?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Kijelölt fájlok törlése"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Törlési mód</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Lomtárba dob törlés helyett"
 
@@ -1202,11 +1220,11 @@ msgstr "Hangerő:"
 msgid "Echo"
 msgstr "Visszhang"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg bővítméyn"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1223,15 +1241,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Fájlíró bővítmény"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Válasszon egy mappát"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1247,195 +1261,291 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a Free "
+"Software Foundation által kiadott GNU General Public License dokumentumában "
+"leírtak alapján; a 2-es licenc, vagy bármely (későbbi) változata szerint. Ez "
+"a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden "
+"egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. További "
+"részleteket a GNU General Public License tartalmaz. A felhasználónak a "
+"programmal együtt meg kell kapnia a GNU General Public License egy "
+"példányát; ha mégsem kapta meg, akkor ezt a Free Software Foundationnak "
+"küldött levélben jelezze Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor Boston, MA 02110-1301, USA. http://www.gnu.org/licenses/ http://"
+"gnu.hu/gpl.html"
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Kimeneti fájl formátum:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Mentés az eredeti könyvtárba"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Mentés egyéni könyvtárba:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Fájlnév generálása innen:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Eredeti fájlnév"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Eredeti fájlnév ( kiterjesztés nélkül)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Eredeti fájl kiterjesztés"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "A szám sorszámának beszúrása a fájlnév elé"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Általános"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Monó"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmus minősége:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Kimenet mintavétele:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitráta / Tömörítési arány:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Algoritmus minősége:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitráta (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Bitráta:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Tömörítési arány:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Audio mód:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Egyéb:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Erőltesse a szigorú ISO megfelelés"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Hiba védelem"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Minőség"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR engedélyezése"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR beállítások:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimális bitsebesség (kbps):"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Minimális bitráta:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximális bitsebesség (kbps):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Maximális bitráta:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Szigorú minimális bitráta"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR beállítások:"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Átlagos bitráta (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Átlagos bitráta:"
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR minőségi szint:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Szigorú minimális bitráta"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Xing VBR fejléc elhagyása"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Keret fejlécek</b>"
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Keret paraméterek:"
-
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Megjelölés jogvédettként"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Megjelölés eredetiként"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 paraméterek:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 tagek</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Mindig adja hozzá a 2-es verzió címkéit"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Csak v1 címkék hozzáadása"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Csak v2 címkék hozzáadása"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Minőség"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Címkék"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Minőségi szint (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Minőség (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Általános"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC dekódoló"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "veszteségmentes"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1447,7 +1557,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1455,19 +1565,19 @@ msgstr ""
 "GIO bővítmény az Audacious-hoz\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO bővítmény"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Olvas-és-hozzáad mód nem támogatott"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Érvénytelen megnyitási mód"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1487,32 +1597,10 @@ msgstr ""
 "\n"
 "Licensz: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL spektrum analizátor"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Spectrum Analizátor Audacious-hoz\n"
-"Copyright 2013 Christophe Budé, John Lindgren, és Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Az XMMS beépülő alapján:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, és "
-"4Front Technologies\n"
-"\n"
-"Licensz: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Gnome rövidítések"
@@ -1533,8 +1621,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Bejegyzés száma"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Cím"
@@ -1591,8 +1679,8 @@ msgstr "Elérhető oszlopok"
 msgid "Displayed columns"
 msgstr "Megjelenített oszlopok"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Kereső eszköz"
 
@@ -1620,335 +1708,338 @@ msgstr "Rögzítés feloldása"
 msgid "Disable"
 msgstr "Letiltás"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Fájl_ok megnyitása ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "_URL megnyitása ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Fájlok hozzá_adása ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL hozzáadása ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "_Keresés a gyűjteményben"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Névjegy ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Beállítások ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Szünet"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Megállítás"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Elő_ző"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Ismétlés"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Véletlenszerű"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Keverés Album szerint"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "_Ne legyen léptetés a lejátszólistában"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "L_eállítás az aktuális dal után"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Dal _információ ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Ugrás _időre ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Ugrás _dalra ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Az 'A' Ismétlési pont beállítása"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "A 'B' ismétlési pont beállítása"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Ismétlési pontok törlése"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Cím szerin_t"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "_Fájlnév szerint"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Fájl _elérési útja szerint"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Sáv szeri_nt"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Elő_adó szerint"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Al_bum szerint"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Albu_m előadó szerint"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "_Dátum szerint"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "_Műfaj szerint"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "_Hossz szerint"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "_Fájl útvonal szerint"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "_Egyedi cím szerint"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Fo_rdított sorrend"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Véletlensze_rű sorrend"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Lejátszás/Szünet"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Frissítés"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "Rendezé_s"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Kije_löltek rendezése"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_Nem elérhető fájlok törlése"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Új"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Át_nevezés ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Tö_rlés"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importálás ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportálás ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Lejátszólista kezelő ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Várakozási sor kezelő ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Hangerő _fel"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Hangerő _le"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Hangszínszabályzó ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_ffektusok ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Közvetítés rögzítése"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Hang _Beállítások ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Menü sor mutatása"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "I_nfo sor mutatása"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Inf_ormációs sáv mutatása"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_Státusz sor mutatása"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Hát_ralévő idő mutatása"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Megjelenítés ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "L_ejátszás"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lejátszólista"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Szervizek"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Kimenet"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Nézet"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Várólistára/Várólistáról ki"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Tartalmazó mappa megnyitása"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "Kiválasztott f_rissítése"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Kivágás"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "B_eillesztés a végére"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Mind kivál_aszt"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Átneve_zés ..."
 
@@ -1989,58 +2080,57 @@ msgstr "Nyíl billentyűk a tekeréshez:"
 msgid "Scroll on song change"
 msgstr "Számváltáskor gördül"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK+ felület"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Pufferelés ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "sztereó"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d csatorna"
 msgstr[1] "%d csatorna"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
@@ -2048,9 +2138,9 @@ msgstr "Leállítás az aktuális dal után."
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Lejátszás"
 
@@ -2058,8 +2148,8 @@ msgstr "Lejátszás"
 msgid "Pause/Resume"
 msgstr "Szünet/Folytatás"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Leállít"
 
@@ -2158,7 +2248,7 @@ msgstr "<b>Billentyű kötések:</b>"
 msgid "_Add"
 msgstr "_Hozzáadás"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Általános gyorsbillentyűk"
 
@@ -2188,25 +2278,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK kimenet"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automatikus csatlakozás a kimeneti portokhoz"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Csak %d darab JACK kimeneti portot találtam, de %d darab kellene."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Sikertelen kapcsolódás a JACK porthoz: %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2214,11 +2304,11 @@ msgstr ""
 "A JACK csak a lebegőpontos audiót támogatja. Kérem állítsa át a kimeneti bit "
 "mélységet lebegőpontosra az Audacious beállításaiban."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Sikertelen kapcsolódás a JACK szerverhez; valóban fut?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2321,48 +2411,48 @@ msgstr "Újracsatlakozás a LIRC szerverhez"
 msgid "Wait before reconnecting:"
 msgstr "Várjon az újracsatlakozás előtt:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki bővítmény"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Nincs elérhető zeneszöveg"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Hiba"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nem sikerült letölteni: %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nem sikerült értelmezni: %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Zeneszöveg keresése ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Érvénytelen a dal metaadata"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Kapcsolódás a lyrics.wikia.com helyhez ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Dalszöveg szerkesztése..."
 
@@ -2374,17 +2464,17 @@ msgstr "M3U lejátszólisták"
 msgid "Tact Generator"
 msgstr "Tact generátor"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generátor: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2543,15 +2633,15 @@ msgstr "A beállítások csak az Audacious újraindítása után érvényesülne
 msgid "MPG123 Plugin"
 msgstr "MPG123 bővítmény"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Haladó</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Pontos hossz számítás (lassú)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Térhatású"
 
@@ -2563,35 +2653,35 @@ msgstr "MPRIS 2 szerver"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS bővítmény"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Hiba az átirányítás elemzésekor"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ismeretlen HTTP hiba"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Hiba az URL elemzésekor"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Túl sok átirányítás"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Leállítva"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Az Audacious nem játszik."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Asztali értesítések"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2635,15 +2725,15 @@ msgstr ""
 "http://www.gnu.org/licenses/\n"
 "http://gnu.hu/gpl.html"
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Lejátszó vezérlők mutatása"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Mindig mutasson értesítést"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Az album nevének megjelenítése az értesítésben"
 
@@ -2651,21 +2741,21 @@ msgstr "Az album nevének megjelenítése az értesítésben"
 msgid "Show"
 msgstr "Mutat"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Szünet"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Következő"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 kimenet"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 kimenet"
 
@@ -2707,23 +2797,23 @@ msgstr ""
 "Köszönet mindenkinek az  #audacious-on, különösen Tony Vroon-nak és John "
 "Lindgren-nek, és persze az előző OSS beépülő készítőinek."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Lejátszólista kezelő"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Elemek"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Át_nevezés"
 
@@ -2735,28 +2825,27 @@ msgstr "PLS lejásztólisták"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekóder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio kimenet"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Audacious PulseAudio Kimeneti Bővítmény\n"
 "\n"
@@ -2778,11 +2867,11 @@ msgstr ""
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02110-1301, USA"
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Kimenet"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2796,47 +2885,73 @@ msgstr ""
 "Az SDL Kimeneti Bővítmény Audacioushoz alapján\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analizátor Audacious-hoz\n"
+"Copyright 2013 Christophe Budé, John Lindgren, és Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Az XMMS beépülő alapján:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, és "
+"4Front Technologies\n"
+"\n"
+"Licensz: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Dolgozom ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Információ"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Keresés"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Mappa megnyitása ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "M_appa hozzáadása ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Napló ellenőr ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Fájlok megnyitása"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Fájlok hozzáadása"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Előző"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Véletlenszerű"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Mappa megnyitása ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "M_appa hozzáadása ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Napló ellenőr ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt felület"
 
@@ -2880,7 +2995,7 @@ msgstr "<b>Átalakítás</b>"
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Ráta:"
 
@@ -2932,58 +3047,47 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling a következőnek: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Hozzáférés megtagadva"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Kattintson a következő linkre a scrobbling engedélyezéséhez:"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Hagyja ezt az ablakot nyitva és kattintson megint az Engedélyek "
-"Ellenőrzésére\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm elérés ellenőrzése ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 "Ne aggódj. A scrobble-jeid a számítógépen vannak tárolva\n"
 "El lesznek küldve amint az Audacious engedélyt kap rá."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Hálózati probléma."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Hozzáférés megtagadva. Scrobbling felhasználó %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Hiba történtg a Last.fm-hez való csatlakozás közben."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Hozzáférés nem engedélyezett. Nyisd meg a következő URL-t a böngészőben és "
+"add hozzá az Audacious hozzáférését a te beállításaidban és kattints újra az "
+"'Engedélyek Ellenőrzésére\":"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Ellenőrzés..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Hiba történt a Last.fm-hez való csatlakozás közben."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Jogosultságok ellenőrzése"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Jogosultságok ellenőrzése"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Jogosultság Megvonása"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Jogosultság megvonása"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
-"Meg kell engedned az Audacious-nak, hogy kommunikáljon a Last.fm fiókoddal.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Szükséges, hogy az Audacious hozzáférjen a te Last.fm fiókodhoz."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3014,7 +3118,7 @@ msgstr ""
 "Köszönet John Lindgren-nek a segítségért a projekt elkezdéséhez.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3023,11 +3127,11 @@ msgstr ""
 "nek\n"
 "Kérlek, ellenőrizd a beállításait."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL kimenet"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3035,58 +3139,58 @@ msgstr ""
 "SDL Kimeneti Bővítmény az Audacious-hoz\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Gyűjtemény"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d találat"
 msgstr[1] "%d találat"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d rejtett)"
 msgstr[1] "(%d rejtett)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d zeneszám"
 msgstr[1] "%d zeneszám"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "műfaj szerint"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "be"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "írta"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Lejátszólista létrehozása"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Lejátszólistához hozzá_ad"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Keresés a gyűjteményben"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3094,11 +3198,11 @@ msgstr ""
 "Az Audacious zenekönyvtárába importáláshoz válaszd ki a mappát majd kattints "
 "a \"Frissítés\" ikonra."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Kérem várjon ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Mappa választás"
 
@@ -3194,15 +3298,15 @@ msgstr "Küszöb:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Ismétlési pontok törölve."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Az 'A' pont beállítva"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "A 'B' pont beállítva"
 
@@ -3254,373 +3358,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hangerő: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansz: %d%% bal"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balansz: közép"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansz: %d%% jobb"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Beállítások menü"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Tiltja a 'Mindig felül' opciót"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Engedélyezi a 'Mindig felül' opciót"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Fájl Információs doboz"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dupla méret"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Megjelenítés"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Rögzítés folyamatban"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Rögzítés leállítva"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Hangerő növelése"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Hangerő csökkentése"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Hatások ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Közvetítés rögzítése"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Hangbeállítások ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Fájlok megnyitása ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "URL megnyitása ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Keresés a gyűjteményben"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Kimenet"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Nézet"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Névjegy ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Beállítások ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Dal információ ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Keverés Album szerint"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Ne legyen léptetés a lejátszólistában"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Leállítás az aktuális dal után"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "A-B Ismétlés beállítása"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "A-B ismétlés törlése"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Ugrás a dalra ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Ugrás időpontra ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Lejátszás/Szünet"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Új lejátszólista"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Lejátszólista átnevezése ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Előző lejátszólista"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Következő lejátszólista"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Lejátszólista importálása"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Lejátszólista exportálása"
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Lejátszólista kezelő ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Várakozási sor kezelő ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Lejátszólista frissítése"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Lejátszólista szerkesztő mutatása"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Hangszínszabályzó mutatása"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Hátralévő idő mutatása"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Mindig felül"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Minden munkaterületen"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Lejátszó felgördítése"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Lejátszólista szerkesztő felgördítése"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Hangszínszabályzó felgördítése"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "URL hozzáadása ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Fájlok hozzáadása ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Cím szerint"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Fájlnév szerint"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Fájl útvonal szerint"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Összes törlése"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Várólista törlése"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Elérhetetlen fájlok törlése"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Nem kiválasztottak törlése"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Kijelölt törlése"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Keresés és választ"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Nincs kijelölés"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Mindet kijelöl"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "A dal sorszáma szerint"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Előadó szerint"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Album szerint"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Album előadó szerint"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Kiadás dátuma szerint"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Műfaj szerint"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Hossz szerint"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Egyéb cím szerint"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Véletlenszerű lista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Fordított lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Kijelöltek rendezése"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Lista rendezése"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Tartalmazó mappa megnyitása"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Beillesztés a végére"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Várólistára/Várólistáról ki"
 
@@ -3633,15 +3745,15 @@ msgstr "Audacious lejátszólista szerkesztő"
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Klasszikus Winamp Kinézet"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Mappa megnyitása..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Mappa hozzáadása..."
 
@@ -3729,7 +3841,7 @@ msgid "Slow"
 msgstr "Lassú"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Közepes"
 
@@ -3865,7 +3977,7 @@ msgstr "Hozzon létre új lejátszólistát az egyező elemekből"
 msgid "Sndfile Plugin"
 msgstr "Sndfile bővítmény"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3912,60 +4024,60 @@ msgstr ""
 "http://www.gnu.org/licenses/\n"
 "http://gnu.hu/gpl.html"
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio kimenet"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Eszköz (alapértelmezetthez hagyd üresen)"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Menti és helyreállítja a hangerőt:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio hiba: Ismeretlen audió formátum (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio hiba: sio_open() sikertelen"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio hiba: sio_setpart() sikertelen"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio hiba: sio_start() sikertelen"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Szám váltás"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Parancsok</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Parancs ami lefut az új zeneszám indításakor:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Parancs ami lefut amikor vége a zeneszámnak:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Parancs ami lefut ha a lejátszólistának vége:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Parancs ami lefut a szám címének változásakor (hálózati folyamhoz):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3973,7 +4085,7 @@ msgstr ""
 "Ezeket a formátumkódokat használhatja, ezeket a parancs lefutása előtt "
 "kicserélem (nem mind hasznos lejátszási lista vége parancskor)"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3999,7 +4111,7 @@ msgstr ""
 "%t: Lejátszási lista pozíciója\n"
 "%T: Cím (formázatlan)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4007,15 +4119,15 @@ msgstr ""
 "Az átadott paramétereket idézőjelbe kell írni. A nem azokba írt paraméterek "
 "biztonsági kockázatot jelentenek"
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Dal információ"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Újramintavételező"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4029,43 +4141,43 @@ msgstr ""
 "Az Újramintavételező Bővítmény alapján:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Gyors"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Alacsony"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Magas"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Nagyon magas"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Minőség:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Sebesség és Hangszín"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Sebesség és Hangszín</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Hangmagasság:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Státusz ikon"
 
@@ -4080,6 +4192,14 @@ msgid ""
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Állapotsor Ikon Beépülő (a Qt interfész részleges portja)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Ez a beépülő tartalmaz egy állapotikont,\n"
+"mely az értesítési sávba kerül az ablakkezelőben."
 
 #: src/statusicon-qt/statusicon.cc:78 src/statusicon/statusicon.cc:387
 msgid "Close to the system tray"
@@ -4160,12 +4280,12 @@ msgstr "<b>Extra Sztereó</b>"
 msgid "Tone Generator"
 msgstr "Hanggenerátor"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Hang generátor:"
 
@@ -4190,7 +4310,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Ének eltávolítás"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4267,7 +4387,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Dekóder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4277,19 +4397,31 @@ msgstr ""
 "Az in_vtx.dll alapján Roman Sherbakov <v_soft@microfor.ru> által\n"
 "Audacious beépülő Pavel Vymetalek <pvymetalek@seznam.cz> által"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut bővítmény az Audacioushoz\n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Dekóder"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "veszteséges (hibrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "veszteséges"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4303,32 +4435,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Dekóder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF Konfiguráció</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Tárolt hossz mellőzése"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists File (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Az átkeverés sikertelen volt, mert a zemeszámoknak eltérő számú "
-#~ "csatornája volt. Használd a Csatornakeverőt a csatornák számának "
-#~ "megváltoztatásához."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Az átkeverés sikertelen volt, mert a zemeszámoknak eltérő volt a "
-#~ "mintavételezési rátája. Használd a Mintavételezési Ráta Konvertert a "
-#~ "mintavételezési ráta megváltoztatásához."
diff --git a/po/id_ID.po b/po/id_ID.po
index fa2b3fd..9f54eb5 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -13,7 +13,7 @@
 #  <kokabiel9@gmail.com>, 2012
 # Liffindra Angga Zaaldian <findrakecil@gmail.com>, 2015
 # martadinata666 <martadinata666@gmail.com>, 2012
-# Mohamad Hasan Al Banna <se7entime@tutanota.com>, 2012-2013
+# Mohamad Hasan Al Banna <se7entime@protonmail.com>, 2012-2013
 #  <pri_yess@yahoo.com>, 2012
 # Rahman Yusri Aftian <aftian@yahoo.com>, 2012-2014
 # Rizki Aulia Rachman <rizkiaulia.r@gmail.com>, 2013
@@ -22,10 +22,10 @@
 #  <yustrizal24@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/jlindgren/"
 "audacious/language/id_ID/)\n"
@@ -35,7 +35,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Dekoder AAC (orisinal)"
 
@@ -43,20 +43,20 @@ msgstr "Dekoder AAC (orisinal)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Pemutar AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "telah diurutkan"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Setel Alarm..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "Awalnya ditulis oleh Adam Feakin dan Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -117,147 +117,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ini adalah panggilan bangun Anda."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Pengingat Anda untuk hari ini adalah..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Pengingat"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Senin"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Kamis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Jumat"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Minggu"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Waktu"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Bunyikan alarm pada (bawaan):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "j"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Diam setelah:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "jam"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "menit"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Pilih hari aktivasi alarm"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Hari"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Bawaan"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Hari"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Memudar"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "detik"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Dimulai dari"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Paripurna"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Sekarang"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Perintah Tambahan"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "gunakan"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Daftar lagu (pilihan)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Pilih daftar lagu"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Pilihan"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Apa yang dimaksud dengan opsi ini?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Sampul Album"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Keluaran ALSA"
 
@@ -300,11 +300,11 @@ msgstr "Perangkat mixer:"
 msgid "Mixer element:"
 msgstr "Elemen mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Pemutar MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -327,68 +327,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Timpa peningkatan bawaan:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Timpa polyphony bawaan:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Timpa gema bawaan:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Nyala"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Timpa paduan suara bawaan:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Putar lagu</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Tukar tempat"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "nada setengah"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Perpindahan drum: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "angka not"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Lompati hening di awal"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Lompati hening yang mengikuti"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Kadar contoh:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -396,86 +396,100 @@ msgstr "Kadar contoh:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pilih berkas SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "Bu_ka"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nama berkas"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Ukuran (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Panjang(milidetik)"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Jumlah trek:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Waktu Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Info dan Lirik MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* tidak ada komentar yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* tidak ada lirik yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Keluar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 tidak cocok)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -487,7 +501,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -539,94 +553,94 @@ msgstr "Jedah mati"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Tampilkan OSD saat lagu diputar kembali."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Penempatan"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Mengimbangi X relatif:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Mengimbangi Y relatif:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Lebar tampilan destop"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opsi Multi Monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Menggunakan tampilan destop"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "Semua monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "waktu (milidetik)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Tampilan:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Menghilang secara cepat:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Menghilang secara perlahan:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Huruf"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Huruf %i"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Bayangan"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Gaya Penggambaran"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Warna"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Warna %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Aktifkan pemicu"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Peristiwa"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Manajer komposisi terdeteksi"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -636,60 +650,56 @@ msgstr ""
 "kecuali kalau kamu tahu bahwa kamu punya satu yang berjalan, harap "
 "diaktifkan sebaliknya OSD tidak akan bekerja dengan baik"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Manajer komposisi tidak dibutuhkan untuk transparansi semu"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparansi"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparansi palsu"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparansi penuh (dibutuhkan Kompositor X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Ekstensi komposisi tidak digunakan"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Ekstensi komposisi tidak tersedia"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>OSD Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posisi"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animasi"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "teks"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekorasi"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Pemicu"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Uji coba"
 
@@ -705,11 +715,11 @@ msgstr "Daftar Putar ASXv1/ASXv2 "
 msgid "Audacious Playlists (audpl)"
 msgstr "Daftar Putar Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Warna</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -733,15 +743,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frekuensi potong:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Penelaah spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Pengaya Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -763,118 +773,118 @@ msgstr ""
 "\n"
 "Ini adalah sebuah proyek Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Perangkat</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Kecepatan membaca:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Timpa perangkat:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Gunakan CD-Teks"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Gunakan CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Gunakan HTTP daripada CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Jalur:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Gagal memulai subsistem cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI Tidak Valid %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Tidak menemukan trek %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Trek %d adalah sebuah trek data."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Galat saat membaca audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Gagal membuka perangkat CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Penggerak kosong."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipe diska tidak didukung."
 
@@ -1027,58 +1037,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Hapus Berkas"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Pindah ke Tong Sampah"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Hapus Berkas Dipilih"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1116,11 +1128,11 @@ msgstr "Volume"
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Pengaya FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1130,15 +1142,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Ambil folder"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1155,194 +1163,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Format berkas keluaran:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Simpan didalam original direktori"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Umum"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Otomatis"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Gabung stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Kualitas Algoritma"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Rasio kompresi:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Mode Otomatis:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Pengaman kesalahan"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kualitas"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Aktifkan VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipe:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opsi VBR"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimal bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Memaksakan dengan ketat bitrate terendah"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opsi ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "bitrate rata-rata (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Tingkat kualitas VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Memaksakan dengan ketat bitrate terendah"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Tandai sebagai hak cipta"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Tandai sebagai orisinil"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Memaksa tambahan tag versi 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Hanya tambahkan tag v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Hanya tambahkan tag v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kualitas"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Tingkat kualitas (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Umum"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1350,25 +1442,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Pengaya GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1380,23 +1472,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1413,8 +1492,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Masukkan angka"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Judul"
@@ -1471,8 +1550,8 @@ msgstr "Kolom tersedia"
 msgid "Displayed columns"
 msgstr "Tampilan kolom"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Alat Pencari"
 
@@ -1500,335 +1579,338 @@ msgstr "Tidak didok"
 msgid "Disable"
 msgstr "Nonaktifkan"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Buka Berkas..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Buka _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Tambah Berkas ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Tambah U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Cari _Pustaka"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "Te_ntang..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Pengaturan...."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Putar"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Se_belumnya"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Sela_njutnya"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Ulangi"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Acak"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_o Kemajuan Playlist"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Informasi_Lagu..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Loncat ke _Waktu..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Loncat ke Lagu..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Oleh_Judul"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Oleh No_Track"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Oleh_Artis"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Oleh _Tanggal Release"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Berdasarkan tempat"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "By _Judul Terkustomisasi"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "B_alik Urutan"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Acak Urutan"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "Sega_rkan"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "Uru_tkan"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Baru"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Hap_us"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Import..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Export..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Manajer Antrian ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Volume _Naik"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Volume _Turun"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Perlihatkan Bar _Menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Perlihatkan _Bar Info"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Perlihatkan Bar _Status"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualisasi"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Berkas"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Pemutaran"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Daftar P_utar"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Layanan"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Keluaran"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Lihat"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Antre/Tidak Antre"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Potong"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Salin"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Tempel"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Pilih _Semua"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Ubah nama ..."
 
@@ -1869,57 +1951,56 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Tampilan GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanal"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "mode Single."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "mode Playlist."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Berhenti setelah lagu"
 
@@ -1927,9 +2008,9 @@ msgstr "Berhenti setelah lagu"
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Putar"
 
@@ -1937,8 +2018,8 @@ msgstr "Putar"
 msgid "Pause/Resume"
 msgstr "Jeda/Mulai Lagi"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Berhenti"
 
@@ -2037,7 +2118,7 @@ msgstr "<b>Kunci Pengikat:</b>"
 msgid "_Add"
 msgstr "T_ambah"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2056,35 +2137,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Keluaran Jack"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2171,48 +2252,48 @@ msgstr "Menyambung kembali ke server LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Tunggu sebelum menyambung kembali:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Tidak ada lirik tersedia"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Mencari lirik ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Menyambungkan ke lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2224,17 +2305,17 @@ msgstr "Daftar Putar M3U"
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Penghasil Tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Penghasil Tact: %d bpm %d%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2382,15 +2463,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "Pengaya MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2402,35 +2483,35 @@ msgstr "Server MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Pengaya Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Berhenti"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious berhenti"
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Pemberitahuan Destop"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2450,15 +2531,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2466,21 +2547,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Istirahat"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Keluaran OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2517,23 +2598,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2545,35 +2626,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2582,47 +2662,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr ""
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Cari"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Ulang"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Acak"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2664,7 +2761,7 @@ msgstr ""
 msgid "Method:"
 msgstr "Metode"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2716,52 +2813,41 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2785,81 +2871,81 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Pustaka"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Buat Daftar Putar"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Tambah ke Daftar Putar"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Cari pustaka"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Mohon tunggu ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Pilih Folder"
 
@@ -2953,15 +3039,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -3013,373 +3099,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Berusaha untuk %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Keseimbangan: %d%% left"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Keseimbangan: tengah"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Keseimbangan: %d%% kanan"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu Opsi"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Nonaktifkan 'Always On Top'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Bolehkan 'Always On Top'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Kotak Info Berkas"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Buka Berkas ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Buka URL...."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Putar Lagu"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Daftar Putar"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Lihat"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servis"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Tentang"
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Pengaturan"
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Info Lagu"
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Tidak ada kemajuan Playlist"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Stop Setelah Lagu Ini"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Lompat ke Lagu ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Lompat ke Waktu ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Daftar Lagu Baru"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Ganti Nama Daftar Putar ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Hapus Daftar Putar"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Daftar Putar Sebelumnya"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Daftar Putar Selanjutnya"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Impor Daftar Putar ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Ekspor Daftar Putar ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Manager Daftar Putar ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Segarkan Daftar Putar"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Munculkan Perubah Daftar Lagu"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Munculkan Equalizer"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Selalu di Atas"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Tambah URL"
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Tambah Berkas ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Dari Judul"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Oleh Path Berkas"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Hapus Semua"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Bersihkan Antrian"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Hapus File yang Tidak Tersedia"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Hapus Duplikat"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Hapus yang tidak Terpilih"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Hapus Yang Dipilih"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Cari dan Pilih"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Balik Pilihan"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Jangan Pilih Apapun"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Oleh Nomor Trek"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Dari Artis"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Dari Album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Oleh Tanggal Rilis"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Acak Daftar"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Balikkan Daftar"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Urutkan yang Terpilih"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Urutkan Daftar"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Potong"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Salin"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Tempel"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3392,15 +3486,15 @@ msgstr "Audacious Daftar Putar Editor"
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Tampilan Winamp Klasik"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3488,7 +3582,7 @@ msgid "Slow"
 msgstr "Lambat"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Sedang"
 
@@ -3624,7 +3718,7 @@ msgstr "Buat daftar putar baru dengan mencocokan entri"
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3646,66 +3740,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Ubah Lagu"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3720,21 +3814,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3743,43 +3837,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Cepat"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Rendah"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Sangat Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kualitas"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Kecepatan dan Nada"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Kecepatan"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Nada"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikon Status"
 
@@ -3865,12 +3959,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3887,7 +3981,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3936,26 +4030,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "yang berkurang (gabungan)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "yang berkurang"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3969,14 +4073,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Pengaturan XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Abaikan panjang dari berkas"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"
diff --git a/po/it.po b/po/it.po
index 0a2b3cb..56f3f4d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,10 +14,10 @@
 # Saverio <saverio.brancaccio@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Italian (http://www.transifex.com/jlindgren/audacious/"
 "language/it/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Decoder AAC (Raw)"
 
@@ -35,20 +35,20 @@ msgstr "Decoder AAC (Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Riproduttore AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sequenziato"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Sveglia"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Regola la sveglia ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "Originariamente scritto da Adam Feakin e Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -157,147 +157,147 @@ msgstr ""
 "Se vuoi che sia mostrato, scrivi il messaggio nel campo\n"
 "d'ingresso ed attiva la checkbox."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Questa è la tua sveglia."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Il tuo promemoria per oggi è..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Lunedì"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Venerdì"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sabato"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Domenica"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Ora"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Sveglia alle (predefinita):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Ferma dopo:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "ore"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuti"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Scegliere i giorni in cui attivare la sveglia"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Giorno"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Giorni"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Dissolvenza"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "secondi"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Inizia a"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Finale"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Attuale"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando aggiuntivo"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "abilita"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Playlist (opzionale)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Seleziona una lista di riproduzione"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Cosa significano queste opzioni?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Copertina Album"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Uscita ALSA"
 
@@ -340,11 +340,11 @@ msgstr "Dispositivo mixer:"
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Plug-in AMIDI (Riproduttore MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -384,68 +384,68 @@ msgstr ""
 "Tony Vroon\n"
 "per l'aiuto fornito durante l'alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Sovrascrivi l'amplificazione di default"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Sovrascrivi la polifonia di default"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Sovrascrivi il riverbero di default"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Acceso"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Sovrascrivi il chorus di default"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Playback</b><b>Riproduzione</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Trasponi:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitoni"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Trasla la batteria:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numeri di note"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Salta il silenzio iniziale"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Salta il silenzio finale"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetizzatore</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Frequenza di campionamento:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -453,86 +453,100 @@ msgstr "Frequenza di campionamento:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleziona file SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancella"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Apri"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Dimensioni (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Informazioni MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Durata (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Numero di tracce: "
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variabile"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Suddivisione temporale:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Commenti e testi MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* nessun commento disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* nessun testo disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 non valido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -551,7 +565,7 @@ msgstr ""
 "Parzialmente basato sulla libreria Ghosd scritta da Evan Martin\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Informazioni sullo schermo)"
 
@@ -604,94 +618,94 @@ msgstr "Disattivazione pausa"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Visualizza l'OSD quando viene ripresa la riproduzione."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Posizionamento"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Offset X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Offset Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Larghezza massima OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opzioni multi-monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Visualizza OSD su:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "tutti i monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Temporizzazione (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Visualizza:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Dissolvi in ingresso:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Dissolvi in uscita:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Carattere %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Ombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Stile di resa grafica"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Colori"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Colore %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Abilita visualizzazione in seguito all'evento"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Rilevato compositing manager"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -701,60 +715,56 @@ msgstr ""
 "a meno che tu non sappia di averne uno in esecuzione, per favore attiva un "
 "compositing manager altrimenti l'OSD non funzionerà correttamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Compositing manager non richiesto per la falsa trasparenza"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Trasparenza"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Falsa trasparenza"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Trasparenza reale (richiede est. Composite di X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Estensione Composite non caricata"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Estensione Composite non disponibile"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posizione"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animazione"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Testo"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decorazione"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Eventi"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Varie"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -770,11 +780,11 @@ msgstr "Liste di riproduzione ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista di riproduzione Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Colore</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -798,15 +808,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frequenza di taglio:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizzatore di spettro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Plugin CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -827,118 +837,118 @@ msgstr ""
 "\n"
 "Questo era un progetto Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocità di lettura: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Ignora dispositivo: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadati</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Usa CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Usa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usa HTTP invece di CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Percorso: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Porta: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Errore nell'inizializzazione del sottosistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s non valido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Traccia %d non trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La traccia %d è una traccia dati."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Errore durante la lettura del CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Errore nell'apertura del lettore CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Nessuna unità CD audio adatta trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Errore alla fine dell'inizializzazione dell'unità CD aperta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Errore nella ricerca del primo/ultimo numero della traccia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Impossibile leggere inizio/fine dell'LNS per la traccia %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Errore nella creazione della connessione al cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Errore nella richiesta al server CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Errore nella richiesta al server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Errore nella lettura delle informazioni del cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Il drive è vuoto."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo di disco non supportato."
 
@@ -1108,58 +1118,60 @@ msgstr "Intensità: "
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Cancella files"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Si è verificato un errore spostando %s nel cestino: %s"
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Si è verificato un errore eliminando %s: %s"
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Si è verificato un errore eliminando %s: file non locale"
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Vuoi spostare i files selezionati nel cestino?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Sposta nel cestino"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Vuoi cancellare permanentemente i files selezionati?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Cancella files selezionati"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Metodo di cancellazione</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Sposta nel cestino invece di cancellare immediatamente"
 
@@ -1201,11 +1213,11 @@ msgstr "Volume: "
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,15 +1233,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Seleziona una cartella"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1246,194 +1254,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato del file in uscita:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Salva nella directory originale"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Genera il nome del file da:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nome del file originale"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Tag del file originale"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Anteponi numero di traccia al nome del file"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Generale"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Qualità dell'algoritmo:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Frequenza di campionamento in uscita:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Rapporto bitrate / compressione:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Fattore di compressione:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Modalità audio:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Varie:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Imponi rispetto rigoroso conformità ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Protezione dagli errori"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualità"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Abilita VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opzioni VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Bitrate minima (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Bitrate massima (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Rispetta rigorosamente bitrate minima"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opzioni ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Bitrate media (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Livello di qualità VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Rispetta rigorosamente bitrate minima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Ometti l'intestazione VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parametri del frame:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Contrassegna come coperto da copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Contrassegna come originale"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parametri ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forza aggiunta del tag versione 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Aggiungi solo tag v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Aggiungi solo tag v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualità"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tag"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Livello di qualità (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Generale"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Decodificatore FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "senza perdita"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1445,7 +1537,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1453,19 +1545,19 @@ msgstr ""
 "GIO Plugin per Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modalità Leggi-e-aggiungi non supportata"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modalità di apertura non valida"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1485,32 +1577,10 @@ msgstr ""
 "\n"
 "Licenza: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spectrum Analyzer"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analizzatore di Spettro OpenGL per Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basato sul plugin di XMMS\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, \n"
-"e 4Front Technologies\n"
-"\n"
-"Licenza: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Scorciatoie di GNOME"
@@ -1531,8 +1601,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Numero elemento"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titolo"
@@ -1589,8 +1659,8 @@ msgstr "Colonne disponibili"
 msgid "Displayed columns"
 msgstr "Colonne visualizzate"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Tool di ricerca"
 
@@ -1618,335 +1688,338 @@ msgstr "Sgancia"
 msgid "Disable"
 msgstr "Disabilita"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Apri file…"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Apri _URL…"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "A_ggiungi file…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Aggiungi U_RL…"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Cerca nella _Libreria"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "I_nformazioni su…"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Configurazione ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Esci"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Riproduci"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Interro_mpi"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Ferma"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Pre_cedente"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Successiva"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Ripe_ti"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "C_asuale"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzare nella playlist"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Ferma _dopo questo brano"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Informazioni sul _brano…"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Salta alla _posizione…"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Sa_lta al brano…"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Imposta Punto di Ripetizione _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Imposta Punto di Ripetizione _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Cancella Punti di Ripetizione"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Per _titolo"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Per nome _File"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Da _Percorso del File"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Per _numero di traccia"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Per _artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Da Al_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Per Albu_m artista"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Per _data di pubblicazione"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Per _Genere"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Da _Lunghezza"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Per percorso del _file"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Per titolo _personalizzato"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Ordine in_verso"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Ordine _casuale"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "Ri_produci/Riparti"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "A_ggiorna"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Ordina i selezionati"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Rimuovi _Duplicati"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Ri_muovi file non disponibili"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nuova"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Rin_omina ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Elimina"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importa…"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Esporta…"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Gestione_Liste di riproduzione ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Gestione co_da…"
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Alza volume"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "A_bbassa volume"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Effetti ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Mostra barra dei _menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostra barra i_nformazioni"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostra barra di vis_ualizzazione informazioni"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mostra barra di _stato"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostra Tempo _Rimasto"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualizzazioni ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_File"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Riproduzione"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Playlist"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servizi"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Uscita"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "Inserisci/rimuovi dalla _coda"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "Apri cartella"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "T_aglia"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "C_opia"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Seleziona _tutti"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Rinomina ..."
 
@@ -1987,58 +2060,57 @@ msgstr "Tasti freccia cercano per:"
 msgid "Scroll on song change"
 msgstr "Fa avanzare la lista quando cambia brano"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interfaccia GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Buffering…"
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canale"
 msgstr[1] "%d canali"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modalità singolo."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modalità playlist."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "La riproduzione si fermerà alla fine del brano."
 
@@ -2046,9 +2118,9 @@ msgstr "La riproduzione si fermerà alla fine del brano."
 msgid "Previous track"
 msgstr "Traccia precedente"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Riproduci"
 
@@ -2056,8 +2128,8 @@ msgstr "Riproduci"
 msgid "Pause/Resume"
 msgstr "Interrompi/riprendi"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Ferma"
 
@@ -2157,7 +2229,7 @@ msgstr "<b>Tasto associato:</b>"
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Hotkeys globali"
 
@@ -2188,26 +2260,26 @@ msgstr ""
 "Jonathan A. Davis <davis@jdhouse.org>,\n"
 "Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Uscita JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Connetti automaticamente alle porte di uscita"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Sono state rilevate solo le porte di uscita %d JACK ma sono richieste le %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Impossibile connettersi alla porta JACK %s"
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2216,11 +2288,11 @@ msgstr ""
 "cambiare la codifica di uscita nelle impostazioni di Audacious, alla voce "
 "profondità di bit: virgola mobile."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Impossibile connettersi al server JACK; è in esecuzione?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2325,48 +2397,48 @@ msgstr "Riconnetti al server LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Attesa prima della riconnessione:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Nessun testo disponibile"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Errore"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossibile recuperare %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Impossibile analizzare %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Ricerca testi ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Metadata brano mancante"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Connessione a lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Modifica testo..."
 
@@ -2378,17 +2450,17 @@ msgstr "Playlists M3U"
 msgid "Tact Generator"
 msgstr "Generatore Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Metronomo: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Metronomo: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2544,15 +2616,15 @@ msgstr "Queste impostazioni avranno effetto al prossimo riavvio di Audacious."
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Opzioni avanzate</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Utilizza il calcolo della lunghezza accurata (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2564,35 +2636,35 @@ msgstr "Server MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Impossibile elaborare la ridirezione"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Errore HTTP sconosciuto"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Impossibile elaborare l'URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Troppe ridirezioni"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Fermato"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious non sta riproducendo."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notifiche Desktop"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2628,15 +2700,15 @@ msgstr ""
 "Dovresti aver ricevuto una copia della licenza GNU General Public License "
 "insieme al programma; se così non fosse, vedi <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Mostra controlli di riproduzione"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Permette di mostrare le notifiche"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Includi il nome dell'album nella notifica"
 
@@ -2644,21 +2716,21 @@ msgstr "Includi il nome dell'album nella notifica"
 msgid "Show"
 msgstr "Mostra"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Interrompi"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Successivo"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Uscita OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Uscita OSS3"
 
@@ -2700,23 +2772,23 @@ msgstr ""
 "Vorrei ringrazire le persone su #audacious, specialmente Tony Vroon e John "
 "Lindgren e sicuramente gli autori del precedente OSS plugin."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gestore delle playlist"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Voci"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Rin_omina"
 
@@ -2728,52 +2800,34 @@ msgstr "Playlist PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificatore OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Uscita PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio Output Plugin⏎\n"
-"\n"
-"Il programma è un software gratuito; puoi ridistribuirlo e/o modificarlo\n"
-"sotto i termini della licenza GNU General Public License come pubblicato "
-"dalla\n"
-"Free Software Foundation; sia la versione 2 della Licenza, sia\n"
-"(a propria scelta) qualsiasi altra versione.\n"
-"\n"
-"Questo programma è distribuito nella speranza che sarà utile,\n"
-"ma SENZA ALCUNA GARANZIA; anche senza l'implicita garanzia di\n"
-"COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la\n"
-"GNU General Public License per maggiori dettagli.\n"
-"\n"
-"Dovresti aver ricevuto una copia della licenza GNU General Public License\n"
-"insieme al programma; se così non fosse, scrivi alla Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Uscita QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2787,47 +2841,73 @@ msgstr ""
 "Basato sul plugin SDL Output per Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizzatore di Spettro OpenGL per Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Basato sul plugin di XMMS\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, \n"
+"e 4Front Technologies\n"
+"\n"
+"Licenza: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "In elaborazione ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Cerca"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "Apri cartella ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Aggiungi cartella ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Ispettore dei log ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Apri file"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Aggiungi file"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Casuale"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "Apri cartella ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Aggiungi cartella ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Ispettore dei log ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interfaccia Qt"
 
@@ -2871,7 +2951,7 @@ msgstr "<b>Conversione</b>"
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Frequenza:"
 
@@ -2923,61 +3003,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Processo di scrobbling per l'utente: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permesso Negato."
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accedi al seguente link per permettere ad Audacious di eseguire lo "
-"scrobbling dei tuoi avvii:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Mantieni aperta questa finestra e clicca ancora su 'Controlla Permesso'.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Non preoccuparti. I tuoi scrobble sono stati salvati sul tuo computer.\n"
-"Loro saranno inviati appena Audacious avrà il permesso di farlo."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema di Rete."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"C'era un problema nel contattare Last.fm. Per favore riprova più tardi."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "In controllo..."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_ontrolla Permesso"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revoca Permesso"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Hai bisogno di permettere ad Audacious di eseguire lo scrobbling delle "
-"tracce al tuo account Last.fm.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3007,7 +3068,7 @@ msgstr ""
 "\n"
 "Grazie a John Lindgren per avermi dato una mano all'inizio del progetto.\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3016,11 +3077,11 @@ msgstr ""
 "fm.\n"
 "Per favore controlla le impostazioni per il plugin Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Uscita SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3028,58 +3089,58 @@ msgstr ""
 "SDL Output Plugin per Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Libreria"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d risultato"
 msgstr[1] "%d risultati"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d nascosto)"
 msgstr[1] "(%d nascosti)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d canzone"
 msgstr[1] "%d canzoni"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "di questo genere"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "in funzione"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "di"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Crea playlist"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Aggiungi alla playlist"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Cerca nella libreria"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3087,11 +3148,11 @@ msgstr ""
 "Per importare la tua musica in Audacious, scegli una cartella e clicca "
 "sull'icona \"aggiorna\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Attendi per favore…"
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Scegli una cartella"
 
@@ -3187,15 +3248,15 @@ msgstr "Soglia:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Punti di Ripetizione Cancellati"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Punto di Ripetizione _A impostato"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Punto di Ripetizione _B impostato"
 
@@ -3247,373 +3308,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Equalizzatore di Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Vai a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Bilanciamento: sinistra %d%%"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Bilanciamento: centro"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Bilanciamento: destra %d%%"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu opzioni"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Disabilita 'Sempre in primo piano'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Abilita 'Sempre in primo piano'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Finestra informazioni file"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Doppia grandezza"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualizzazioni"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Apri files ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Apri URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Cerca nella libreria"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Visualizza"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servizi"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Informazioni ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Impostazioni ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Esci"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Informazioni sul brano"
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Non avanzare nella playlist"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Interrompi al termine di questo brano"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Setta ripetizione A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Elimina ripetizione A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Vai a brano ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Vai a istante di tempo ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Riproduci/Riparti"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Cambia nome a Playlist"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Elimina Playlist"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Playlist precedente"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Playlist successiva"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importazione Playlist ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Esportazione Playlist ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Organizza Playlist ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Organizza Coda ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Aggiorna Playlist"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostra editor della playlist"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostra equalizzatore"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Mostra tempo rimanente"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sempre in primo piano"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Su tutti gli spazi di lavoro"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Arrotola il Player"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Arrotola l'editor di Playlist"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Arrotola l'equalizzatore"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Aggiungi URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Aggiungi files ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Per titolo"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Per nome File"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Per percorso file"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Rimuovi tutti"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Cancella coda"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Rimuovi i file non disponibili"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Rimuovi i duplicati"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Rimuovi deselezionati"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Rimuovi selezionati"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Cerca e seleziona"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverti selezione"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Deseleziona tutti"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Per numero di traccia"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Per artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Per album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Per album artista"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Per data di pubblicazione"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Per Genere"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Per Durata"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Per titolo personalizzato"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Riordina casualmente la lista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Inverti lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Ordina selezionati"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordina lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copia"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Metti in/togli da coda"
 
@@ -3626,15 +3695,15 @@ msgstr "Editor della playlist di Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d di %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interfaccia classica di Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Apri cartella..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Aggiungi cartella..."
 
@@ -3722,7 +3791,7 @@ msgid "Slow"
 msgstr "Lenta"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Media"
 
@@ -3858,7 +3927,7 @@ msgstr "Crea una nuova playlist con gli elementi trovati"
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3899,62 +3968,62 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Uscita Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (lasciare vuoto per usare quello predefinito):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Salva e ripristina il volume:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Errore Sndio: Formato audio non supportato (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Errore Sndio: sio_open() fallito"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Errore Sndio: sio_setpar() fallito"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Errore Sndio: sio_start() fallito"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Cambio brano"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Comandi</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Comando da lanciare quando si avvia una nuova canzone:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Comando da lanciare al termine di una canzone:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando da lanciare alla fine di una playlist:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando da lanciare quando cambia il titolo di una canzone (per gli stream "
 "in rete):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3963,7 +4032,7 @@ msgstr ""
 "dell'esecuzione del comando (non tutti sono utili per il comando fine-"
 "playlist):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3989,7 +4058,7 @@ msgstr ""
 "%t: Posizione nella playlist\n"
 "%T: Titolo (non formattato)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3997,15 +4066,15 @@ msgstr ""
 "Si devono quotare con virgolette i parametri passati alla shell. Parametri "
 "non virgolettati potrebbero portare a risultati inattesi."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Informazioni sulla canzone"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4019,43 +4088,43 @@ msgstr ""
 "Basato sul Plugin Sample Rate Converter:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Veloce"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Basso"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Molto Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualità:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocità e Tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocità e Tono</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocità: "
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tono:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icona di stato"
 
@@ -4151,12 +4220,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Generatore di toni"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generatore di toni: "
 
@@ -4179,7 +4248,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Rimozione voce"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4256,7 +4325,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Decodificatore VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4267,19 +4336,29 @@ msgstr ""
 "Basato su in_vtx.dll realizzato da Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin Audacious realizzato da Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Decodificatore WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "senza perdita (ibrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "con perdita"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4293,14 +4372,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Decodificatore 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configurazione XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignora la lunghezza dal file"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Liste di riproduzione condivisibili XML (XSPF)"
diff --git a/po/ja.po b/po/ja.po
index 9a108d9..f1ec4e5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,18 +8,18 @@
 # ABE Tsunehiko, 2013
 # ABE Tsunehiko, 2012
 # Mika Kobayashi, 2014-2015
-# TAKAHASHI Shuuji <shuuji3@gmail.com>, 2012-2014
-# TAKAHASHI Shuuji <shuuji3@gmail.com>, 2015
+# Shuuji TAKAHASHI (shuuji3) <shuuji3@gmail.com>, 2012-2014
+# Shuuji TAKAHASHI (shuuji3) <shuuji3@gmail.com>, 2015
 # Warui-chan  <>, 2012
 # ABE Tsunehiko, 2012
 # ABE Tsunehiko, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-11-08 06:27+0000\n"
-"Last-Translator: ABE Tsunehiko\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Japanese (http://www.transifex.com/jlindgren/audacious/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) デコーダー"
 
@@ -36,20 +36,20 @@ msgstr "AAC (Raw) デコーダー"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib プレイヤー)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "シーケンス"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "アラーム"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "アラームをセット"
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "元の作者: Adam Feakin および Daniel Stodden"
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -156,147 +156,147 @@ msgstr ""
 "表示するには、入力フィールドにリマインダを入力し、\n"
 "チェックボックスを有効にしてください。"
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "目覚ましです。"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "今日のリマインダー:"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "リマインダー"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "月曜日"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "木曜日"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "金曜日"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "土曜日"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "日曜日"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "時刻"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "アラーム時刻 (デフォルト)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr " "
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "静かになるまでの時間:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "時間"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "分"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "アラームが鳴る曜日"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "曜日"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "デフォルト"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "曜日"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "フェード"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "フェード開始音量"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "フェード終了音量"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "現在の音量"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "追加コマンド"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "有効"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "プレイリスト (オプション)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "プレイリストを選択"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "オプション"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "オプションの説明"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 出力"
 
@@ -338,11 +338,11 @@ msgstr "ミキサーデバイス:"
 msgid "Mixer element:"
 msgstr "ミキサーエレメント"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI プレイヤー)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -385,68 +385,68 @@ msgstr ""
 "Tony Vroon\n"
 "　アルファテスト時にとてもよく手伝ってくれた。"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "デフォルトのゲインを上書き:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "デフォルトのポリフォニーを上書き:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "デフォルトのリバーブを上書き:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "オン"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "デフォルトのコーラスを上書き:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>再生</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "トランスポーズ: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "ドラムシフト: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "ノートナンバー"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "先頭の無音をスキップ"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "末尾の無音をスキップ"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>サウンドフォント</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>シンセサイザー</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "サンプリングレート:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -454,86 +454,100 @@ msgstr "サンプリングレート:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - サウンドフォント ファイルの選択"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "サイズ (バイト)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "名前:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI 情報 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "形式:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "長さ (ミリ秒):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "トラック数:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "可変"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "時間軸:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI コメントと歌詞 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効なコメントがありません *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効な歌詞がありません *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "プレイリストを閉じる(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (不正な UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -552,7 +566,7 @@ msgstr ""
 "一部は Evan Martin 作の Ghosd ライブラリーに基づきます:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -604,94 +618,94 @@ msgstr "再生の再開"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "再生が再開したときに OSD を表示します。"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "相対 X オフセット:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "相対 Y オフセット:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "最大 OSD 幅:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "マルチモニターオプション"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD を表示するモニター:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "全てのモニター"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "モニター %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "タイミング (ミリ秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "表示:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "フェードイン:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "フェードアウト:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "フォント %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "描画形式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "色 %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "有効にする"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "イベント"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "コンポジットマネージャーが検出されました"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -701,60 +715,56 @@ msgstr ""
 "動作させているかわからなければ、Composite マネージャーを有効にしてください。"
 "そうしなければ OSD は正常に動作しないでしょう。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "擬似的な透明化の場合コンポジットマネージャーは不要です"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "透明化"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "擬似的な透明化"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真の透明化 (X コンポジット拡張が必要)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "コンポジット拡張が読み込まれていません"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "コンポジット拡張が無効です"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "アニメーション"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "装飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "トリガー"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "その他"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "テスト"
 
@@ -770,11 +780,11 @@ msgstr "ASXv1/ASXv2 プレイリスト"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious プレイリスト (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>色</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "ブラースコープ"
 
@@ -798,15 +808,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "カット周波数"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "スペクトラムアナライザー"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "オーディオ CD プラグイン"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -826,119 +836,119 @@ msgstr ""
 "\n"
 "このプラグインは、Google Summer of Code 2007 のプロジェクトです。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>デバイス</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "読み込み速度:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "上書きデバイス"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>メタデータ</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "CD-Text を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP の代わりに HTTP を使う"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "パス:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio サブシステムの初期化に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "次の URI は無効です。%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "トラック %d が見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "トラック %d はデータトラックです。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr " オーディオ CD の読み込み中にエラーが発生しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "オーディオ CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "CD デバイス %s のオープンに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "オーディオが利用可能な CD ドライブが見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "オープンされた CD ドライブの初期化が完了できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "最初または最後のトラックナンバーを取得できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 "トラック %d の LSN (論理セクタ番号) の開始または終了が読み取れませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "cddb コネクションの作成に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "CDDB サーバへのクエリに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB サーバへのクエリに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "cddb 情報の読み取りに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "ドライブにディスクがありません。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "非対応のディスクです。"
 
@@ -1108,59 +1118,61 @@ msgstr "明るさ:"
 msgid "Crystalizer"
 msgstr "クリスタライザー"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue シートプラグイン"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "ファイルの削除"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "%s をゴミ箱に移動中に次のエラーが発生しました。%s。"
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "%s の削除中に次のエラーが発生しました。%s。"
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 "%s の削除中に次のエラーが発生しました。ローカルなファイルではありません。"
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "選択したファイルをゴミ箱に移動しますか？"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "ゴミ箱に移動する"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "選択したファイルを完全に削除しますか？"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "削除"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "選択したファイルの削除"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>削除の方法</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "直ちに削除するかわりにゴミ箱に移動"
 
@@ -1202,11 +1214,11 @@ msgstr "音量:"
 msgid "Echo"
 msgstr "エコー"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg プラグイン"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1222,15 +1234,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "ファイル出力プラグイン"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "フォルダーの選択"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1260,194 +1268,278 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "出力ファイルフォーマット:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "元のディレクトリーに保存する"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "カスタムディレクトリーに保存:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "ファイルネームを次から生成:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "オリジナルのファイル名 (拡張子なし)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "元のファイルのタグ"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "ファイル名の前にトラック番号を付ける"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "一般"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "ジョイントステレオ"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "モノラル"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "アルゴリズム品質:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "出力サンプリングレート:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "ビットレート / 圧縮率:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "ビットレート (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "圧縮率:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "オーディオ モード:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "その他:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "厳格な ISO 遵守を強制する"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "エラー保護"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "音質"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR を有効にする"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR オプション:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "最小ビットレート (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "最大ビットレート (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "最小ビットレートを厳格に強制する"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR オプション:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "平均ビットレート (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR 品質レベル:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "最小ビットレートを厳格に強制する"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Xing VBR ヘッダを除く"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "フレームパラメーター:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "著作権物としてマーク"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "オリジナルとしてマーク"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 パラメーター:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "v2 タグを強制的に付加する"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "v1 タグのみ付加する"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "v2 タグのみ付加する"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "音質"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "タグ"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "品質レベル (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "一般"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC デコーダー"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "可逆"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1459,7 +1551,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1467,19 +1559,19 @@ msgstr ""
 "GIO プラグイン for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO プラグイン"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "リードアンドアペンドモードには対応していません"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "無効なオープンモード"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1499,32 +1591,10 @@ msgstr ""
 "\n"
 "ライセンス: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL スペクトラムアナライザー"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL スペクトラムアナライザー for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"派生元: XMMS プラグイン:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"ライセンス: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME ショートカット"
@@ -1545,8 +1615,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "リスト番号"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "タイトル"
@@ -1603,8 +1673,8 @@ msgstr "利用できる列"
 msgid "Displayed columns"
 msgstr "表示された列"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "検索ツール"
 
@@ -1632,335 +1702,338 @@ msgstr "ドッキングを解く"
 msgid "Disable"
 msgstr "無効"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "ファイルを開く(_O)"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "URL を開く(_U)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "ファイルを追加(_A)"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "URL を追加(_R)"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "ライブラリーを検索(_L)"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "プログラムの情報(_B)"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "設定(_S)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "一時停止(_E)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "前の曲へ(_V)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "次の曲へ(_N)"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "リピート(_R)"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "シャッフル(_H)"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "アルバムごとにシャッフル (_M)"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "1 曲リピート(_O)"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "曲の再生後に停止(_A)"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "曲の情報(_I)"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "指定した時間にジャンプ(_T)"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "指定した曲にジャンプ(_J)"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "リピートポイントAを設定(_A)"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "リピートポイントBを設定(_B)"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "リピートポイントを解除(_C)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "タイトル(_T)"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "ファイル名(_F)"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "パス(_P)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "トラックナンバー(_N)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "アーティスト(_A)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "アルバム(_L)"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "アルバムアーティスト(_M)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "リリース日(_D)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "ジャンル(_G)"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "曲の長さ(_L)"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "ファイルパス(_F)"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "カスタムタイトル(_C)"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "逆順にする(_E)"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "ランダムに並べる(_R)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "再生/再開(_P)"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "再読み込み(_R)"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "ソート(_S)"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "選択したトラックをソート(_L)"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "重複している曲を削除(_D)"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "再生できないファイルを削除(_U)"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "新しいプレイリスト(_N)"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "名前の変更(_A)"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "削除(_V)"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "インポート(_I)"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "エクスポート(_E)"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "プレイリストマネージャー(_M)"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "キューマネージャー(_Q)"
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "音量を上げる(_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "音量を下げる(_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "イコライザー... (_E)"
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "エフェクト(_E)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "ストリームの録音 (_R)"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "オーディオの設定... (_S)"
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "メニューバーを表示(_M)"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "情報バーを表示(_N)"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "情報バーに視覚効果を表示(_U)"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "ステータスバーを表示(_S)"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "残り時間を表示(_R)"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "視覚化(_V)"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "プレイリスト(_L)"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "サービス(_S)"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "出力(_O)"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "表示(_V)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "キュー/アンキュー (_Q)"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "このファイルを含むフォルダを追加(_O)"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "名前の変更(_R)"
 
@@ -2001,57 +2074,56 @@ msgstr "矢印キーでシークする時間:"
 msgid "Scroll on song change"
 msgstr "曲が変わったらスクロールする"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK インターフェイス"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "バッファ中 ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "モノラル"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "ステレオ"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d チャンネル"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "シングルモード"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "プレイリストモード"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "曲の再生後に停止する"
 
@@ -2059,9 +2131,9 @@ msgstr "曲の再生後に停止する"
 msgid "Previous track"
 msgstr "前のトラック"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "再生"
 
@@ -2069,8 +2141,8 @@ msgstr "再生"
 msgid "Pause/Resume"
 msgstr "一時停止/再開"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "停止"
 
@@ -2169,7 +2241,7 @@ msgstr "<b>キーバインド:</b>"
 msgid "_Add"
 msgstr "追加 (_A)"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "グローバルホットキー"
 
@@ -2199,25 +2271,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK 出力"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "出力ポートに自動接続する"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "%d 個の JACK 出力ポートが見つかりましたが、 %d 個必要です。"
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "JACK ポート %s への接続に失敗"
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2225,11 +2297,11 @@ msgstr ""
 "JACK は浮動小数点のオーディオにのみ対応しています。Audacious のオーディオ出力"
 "の設定で、ビット深度を浮動小数点に変更する必要があります。"
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "JACK サーバへの接続に失敗しました。JACK サーバは本当に動いていますか?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2333,48 +2405,48 @@ msgstr "LIRC サーバーへ再接続する"
 msgid "Wait before reconnecting:"
 msgstr "再接続の待機時間:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki プラグイン"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "歌詞が見つかりません"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "エラー"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s が取得できません"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s が解析できません"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "歌詞を検索しています ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "曲のメタデータが見つかりません"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "lyrics.wikia.com に接続しています ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "歌詞を編集 ..."
 
@@ -2386,17 +2458,17 @@ msgstr "M3U プラグイン"
 msgid "Tact Generator"
 msgstr "タクトジェネレーター"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレーター: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレーター: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2556,15 +2628,15 @@ msgstr "これらの設定は、Audacious の再起動後に反映されます�
 msgid "MPG123 Plugin"
 msgstr "MPG123 プラグイン"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>高度な設定</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "正確な長さを計算する(遅い)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "サラウンド"
 
@@ -2576,35 +2648,35 @@ msgstr "MPRIS 2 サーバー"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS プラグイン"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "リダイレクト処理のエラー"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "不明な HTTP エラー"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "URL 処理のエラー"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "リダイレクトの過剰な繰返し"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "停止しました"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious は曲を再生していません。"
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "デスクトップ通知"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2643,15 +2715,15 @@ msgstr ""
 "法的効力があると承認されたものではありません。何が許可されているか厳密に確認"
 "するためには、(英語で書かれた)オリジナルのGPLを参照してください。）"
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "再生コントロールを表示する"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "常に通知を表示する"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "アルバムの名前も通知に含める"
 
@@ -2659,21 +2731,21 @@ msgstr "アルバムの名前も通知に含める"
 msgid "Show"
 msgstr "表示する"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "一時停止"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "次の曲"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 出力"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 出力"
 
@@ -2716,23 +2788,23 @@ msgstr ""
 "#audacious の人々、特に Tony Vroon および John Lindgren、そしてもちろん、OSS "
 "plugin の前作者に感謝します。"
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "プレイリストマネージャー"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "項目数"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "名前の変更(_A)"
 
@@ -2744,51 +2816,34 @@ msgstr "PLS プレイリスト"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 デコーダー"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio 出力"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio 出力プラグイン\n"
-"\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"
-"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,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 出力"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2802,47 +2857,73 @@ msgstr ""
 "派生元: SDL 出力プラグイン for Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL スペクトラムアナライザー for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"派生元: XMMS プラグイン:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"ライセンス: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "処理中 ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "検索"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "フォルダを開く(_O)"
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "フォルダを追加(_A)"
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "ログ検査(_L)"
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "ファイルを開く"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "ファイルを追加"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "前の曲"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "リピート"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "シャッフル"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "フォルダを開く(_O)"
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "フォルダを追加(_A)"
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "ログ検査(_L)"
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt インターフェイス"
 
@@ -2886,7 +2967,7 @@ msgstr "<b>変換</b>"
 msgid "Method:"
 msgstr "方法"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "レート:"
 
@@ -2938,60 +3019,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "ユーザー %s の Scrobble に成功しました。"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "アクセス許可がありません"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Audacious に scrobble する許可を与えるには、以下のリンクにアクセスしてくださ"
-"い。"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"このウィンドウを開いたまま、もう一度「認証確認」をクリックしてください。\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"あなたの Scrobble はコンピュータに保存されています。\\n\n"
-"Audacious は投稿が可能になり次第、すぐに Scrobble を投稿します。"
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "ネットワークに問題があります。"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm への接続に問題が発生しました。あとでもう一度試してください。"
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "チェックしています..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "認証確認(_H)"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "認証取消(_R)"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Audacious があなたの Last.fm アカウントにトラックを scrobble できるように設定"
-"する必要があります。\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3019,7 +3082,7 @@ msgstr ""
 "Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\\n\\n\n"
 "プロジェクト開始時に手助けしてくれた John Lindgren に感謝します。\\n\\n\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3027,11 +3090,11 @@ msgstr ""
 "Audacious は Last.fm Scrobbler のバージョンを更新しました。\n"
 "Scrobbler プラグインの設定をご確認ください。"
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 出力"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3039,55 +3102,55 @@ msgstr ""
 "SDL 出力プラグイン for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "ライブラリー"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d 件"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d の隠し)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d 曲"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "（このジャンル中で）"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "アルバム:"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "アーティスト:"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "プレイリストを作成(_C)"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "プレイリストに追加(_A)"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "ライブラリーを検索"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3095,11 +3158,11 @@ msgstr ""
 "音楽ライブラリーを Audacious へインポートするには、フォルダを選択し、\"再読み"
 "込み\" アイコンをクリックしてください。"
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "お待ちください..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "フォルダーを選択"
 
@@ -3195,15 +3258,15 @@ msgstr "しきい値:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "リピートポイントがクリアされました。"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "リピートポイントAを設定します。"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "リピートポイントBを設定します。"
 
@@ -3255,373 +3318,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious イコライザー"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "%d:%-2.2d / %d:%-2.2d へシークする"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "バランス: %d%% 左"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "バランス: 中央"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "バランス: %d%% 右"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "オプションメニュー"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "「常に最前面に配置」無効"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "「常に最前面に配置」有効"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "ファイル情報ボックス"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "2倍の大きさで表示"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "視覚化"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "録音中"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "録音停止"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "音量を上げる"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "音量を下げる"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "エフェクト..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "ストリームの録音"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "オーディオの設定..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "ファイルを開く"
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "URLを開く"
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "ライブラリーを検索"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "演奏"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "出力"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "表示"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "サービス"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "情報"
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "設定"
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "終了"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "曲の情報"
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "アルバムごとにシャッフル"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "次の曲に進まない"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "曲の再生後に停止"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "A-B リピートをセット"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "A-B リピートをクリア"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "指定した曲にジャンプ"
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "指定した時間へジャンプ"
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "再生/再開"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "新しいプレイリスト"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "プレイリストの名前を変更"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "プレイリストを削除"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "前のプレイリスト"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "次のプレイリスト"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "プレイリストのインポート"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "プレイリストのエクスポート"
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "プレイリストマネージャー"
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "キューマネージャー"
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "プレイリストの更新"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "プレイリストエディターを表示する"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "イコライザーを表示する"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "残り時間を表示する"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "常に最前面に配置する"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "全ワークスペースに配置する"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "プレイヤーをたたむ"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "プレイリストエディターをたたむ"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "イコライザーをたたむ"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "URLを追加"
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "ファイルを追加"
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "タイトル"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "ファイル名"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "ファイルパス"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "全て削除"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "キューのクリア"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "利用できないファイルの削除"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "重複エントリの削除"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "選択していないエントリの削除"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "選択したエントリの削除"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "検索と選択"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "未選択にする"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "トラック番号"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "アーティスト"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "アルバム"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "アルバムアーティスト"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "リリース日"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "ジャンル"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "長さ"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "カスタムタイトル"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "プレイリストをランダムにする"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "プレイリストを逆順にする"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "選択範囲をソート"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "プレイリストをソート"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "切り取り"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "コピー"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "キュー/アンキュー"
 
@@ -3634,15 +3705,15 @@ msgstr "Audacious プレイリストエディター"
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp クラシックインターフェイス"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "フォルダを開く"
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "フォルダを追加"
 
@@ -3730,7 +3801,7 @@ msgid "Slow"
 msgstr "遅い"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "中"
 
@@ -3865,7 +3936,7 @@ msgstr "マッチした項目で新しいプレイリストを作成する"
 msgid "Sndfile Plugin"
 msgstr "Sndfile プラグイン"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3905,61 +3976,61 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 出力"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "デバイス (空白の場合はデフォルト)"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "音量を保存し復元:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio エラー: サポートしていないオーディオ形式 (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio エラー: sio_open() に失敗"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio エラー: sio_setpar() に失敗"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio エラー: sio_start() に失敗"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "楽曲の変更通知"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>コマンド</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "新しい曲の再生時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "曲の終了時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "プレイリストの終了時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "曲タイトルが替わったときに実行するコマンド (ネットワークストリーミング用):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3967,7 +4038,7 @@ msgstr ""
 "次のフォーマットコードが使用できます。コードはコマンドの実行前に置き換えられ"
 "ます。（プレイリストの最後の曲には使用できないものもあります）"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3993,7 +4064,7 @@ msgstr ""
 "%t: プレイリストの位置\n"
 "%T: タイトル (フォーマット化していないもの)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4001,15 +4072,15 @@ msgstr ""
 "シェルに渡すパラメーターは引用符でくくってください。引用符がない場合、思わぬ"
 "結果が起きることがあります。"
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "曲の情報"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX リサンプラー"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4023,43 +4094,43 @@ msgstr ""
 "派生元: サンプリング周波数コンバータプラグイン\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "高速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "低品質"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "高品質"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "最高品質"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "品質:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "テンポとピッチ"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>テンポとピッチ</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "テンポ:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "ピッチ:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "ステータスアイコン"
 
@@ -4163,12 +4234,12 @@ msgstr "<b>エクストラステレオ</b>"
 msgid "Tone Generator"
 msgstr "トーンジェネレーター"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "トーンジェネレーター: "
 
@@ -4195,7 +4266,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "ボーカルの除去"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4272,7 +4343,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX デコーダー"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4283,19 +4354,29 @@ msgstr ""
 "Roman Sherbakov <v_soft@microfor.ru> の in_vtx.dll を基にしています。\n"
 "Audacious への実装は、Pavel Vymetalek <pvymetalek@seznam.cz> が行いました。"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack デコーダー"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "非可逆 (ハイブリッド)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "非可逆"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4309,30 +4390,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF デコーダー"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF の設定</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "ファイルに記録されている再生時間を無視"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "共有可能な XML プレイリスト (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "曲のチャンネル数が異なるため、クロスフェードに失敗しました。チャンネルミキ"
-#~ "サーを利用して、曲のチャンネル数を変換することができます。"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "曲のサンプリング周波数が異なるため、クロスフェードに失敗しました。サンプリ"
-#~ "ング周波数コンバーターを利用してサンプリング周波数を揃えることができます。"
diff --git a/po/ko.po b/po/ko.po
index 136260e..1b2baf5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -15,11 +15,11 @@
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2012-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-09-22 13:08+0000\n"
-"Last-Translator: Kim ju-gwang <hhs4272@naver.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Korean (http://www.transifex.com/jlindgren/audacious/language/"
 "ko/)\n"
 "Language: ko\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 디코더"
 
@@ -36,20 +36,20 @@ msgstr "AAC (Raw) 디코더"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 재생기)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "순차"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "알림"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "알림 설정..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "초기에 Adam Feakin과 Daniel Stodden이 작성했습니다."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -110,147 +110,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "기상 알림입니다."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "오늘 약속은..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "약속 알리미"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "월요일"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "화요일"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "수요일"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "목요일"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "금요일"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "토요일"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "일요일"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "시계"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "다음 시간에 알림(기본):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "시"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "다음 시간후 조용히:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "시간"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "분"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "알림을 울릴 날짜를 선택합니다"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "요일"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "기본값"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "일"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "점진적 음량 변화 시간"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "초"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "음량"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "시작"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "끝"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "현재"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "추가 명령"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "활성화"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "재생 목록(선택)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "재생 목록 선택하기"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "옵션"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "이 옵션은 무엇을 의미하나요?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "도움말"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "앨범 표지"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 출력"
 
@@ -292,11 +292,11 @@ msgstr "음량 조절기 장치:"
 msgid "Mixer element:"
 msgstr "음량 조절기 요소:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 재생기)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -319,68 +319,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "기본 게인 값 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "기본 화성 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "기본 리버브 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "켬"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "기본 코러스 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>재생</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "트랜스포스:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "드럼 쉬프트:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>사운드 폰트</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>신디사이저</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -388,86 +388,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 사운드 폰트 파일 선택"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "크기(바이트)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "이름:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> 미디 정보 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "형식:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "길이(밀리초):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "트랙 번호:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "가변"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "빠르기(BPM):"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "빠르기(BPM, wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "박자:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> 미디 주석과 가사 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* 이 미디 파일에는 주석이 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 이 미디 파일에는 가사가 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr " (잘못된 UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -486,7 +500,7 @@ msgstr ""
 "Evan Martin's Ghosd 라이브러리 일부를 기반으로 함:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (화면에 표시)"
 
@@ -538,94 +552,94 @@ msgstr "일시 정지 활성화"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "멈춰진 재생 상태에서 복귀할 때 OSD를 시작합니다."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "위치"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "상대 X 오프셋:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "상대 Y 오프셋:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "최대 OSD 폭:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "다중 모니터 옵션"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD 사용중 표시:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "모든 모니터"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "%i번 모니터 "
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "타이밍(밀리초)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "디스플레이:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "나타내기 시간:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "사라지기 시간:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "글꼴"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "%i번 글꼴:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "섀도우"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "표현 방식"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "색"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "%i번 색:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "트리거 활성화"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "이벤드"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "합성 관리자를 삭제했습니다"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -635,60 +649,56 @@ msgstr ""
 "적어도 하나가 실행중인지 알지 못한다면, 합성 관리자를 활성화 해 주십시오. 그"
 "렇지 않으면 OSD가 제대로 동작하지 않습니다"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "투명도 속이기에 합성 관리자가 필요하지 않습니다"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "투명도"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "투명도 속이기"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "실제 투명도 ( X 합성 확장이 필요합니다 )"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "합성 확장을 불러오지 않았습니다"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "합성 확장을 사용할 수 없습니다"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>오데이셔스 OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "위치"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "애니메이션"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "글자"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "장식"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "트리거"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "기타"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "시험"
 
@@ -704,11 +714,11 @@ msgstr "ASXv1/ASXv2 재생 목록"
 msgid "Audacious Playlists (audpl)"
 msgstr "오데이셔스 재생 목록(audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>색</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "흐림처리 스코프"
 
@@ -732,15 +742,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "주파수 잘라내기:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "스펙트럼 분석기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "오디오 CD 플러그인"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -760,118 +770,118 @@ msgstr ""
 "\n"
 "이 프로젝트는 GSoC 2007에서 만들었습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>장치</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "읽기 속도:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "장치 대체:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>메타데이터</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "CD-Text 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP 대신 HTTP 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "서버:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "경로:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "포트:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio 하위 시스템을 초기화하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "잘못된 %s URI 입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "%d 트랙이 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "%d 트랙은 데이터 트랙입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "오디오 CD 읽는중 오류가 발생했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "오디오 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "%s CD 장치를 여는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "오디오를 재생할 수 있는 CD 드라이브가 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "열려 있는 CD 드라이브 초기화를 끝내는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "첫번째/마지막 트랙 번호를 검색하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "%d번 트랙에 대한 시작/끝 LSN을 읽을 수 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "cddb 연결을 만드는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "CDDB 서버에 요청하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB 서버에 요청하는데 실패했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "cddb 정보를 읽는데 실패했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "드라이브가 비어 있습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "지원하지 않는 디스크 형식입니다."
 
@@ -1030,58 +1040,60 @@ msgstr "강도:"
 msgid "Crystalizer"
 msgstr "크리스털라이저"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "큐 시트 플러그인"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "파일 삭제"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "%s을(를) 휴지통으로 이동하는 중 오류: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "%s을(를) 삭제하는 중 오류: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "%s을(를) 삭제하는 중 오류: 로컬 파일이 아닙니다."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "선택한 파일을 휴지통으로 이동하시겠습니까?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "휴지통으로 이동"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "선택한 파일을 완전히 삭제하시겠습니까?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "삭제"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "취소"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "선택한 파일 삭제"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>삭제 방식</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "즉시 삭제하는 대신 휴지통으로 이동"
 
@@ -1119,11 +1131,11 @@ msgstr "음량:"
 msgid "Echo"
 msgstr "울림"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 플러그인"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1139,15 +1151,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter 플러그인"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "폴더 선택하기"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1164,194 +1172,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "출력 파일 형식:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "원본 디렉터리에 저장"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "원본 파일 이름"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "원본 파일 태그"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "일반"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "자동"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "통합 스테레오"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "스테레오"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "모도"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "알고리즘 품질:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "출력 샘플 주파수:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "비트 전송률/압축율:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "비트전송율(kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "압축율:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "오디오 모드:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "기타:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "엄격한 ISO 규격 강제"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "오류 방지"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "음질"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR 활성화"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "형식:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR 옵션:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "최소 비트레이트(kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "최대 비트레이트(kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "최소 비트전송율을 철저하게 강제"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR 옵션:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "평균 비트전송율(kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR 음질 수준:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "최소 비트전송율을 철저하게 강제"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "프레임 매개변수:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Copyright로 표시"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "원본으로 표시"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 매개변수:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "버전 2 태그 추가사항 강제"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "v1 태그만 추가"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "v2 태그만 추가"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "음질"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "태그"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "음질 수준(0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "일반"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC 디코더"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "무손실"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1363,7 +1455,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1371,19 +1463,19 @@ msgstr ""
 "오데이셔스용 GIO 플러그인\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO 플러그인"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "잘못된 열기 모드"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1403,23 +1495,10 @@ msgstr ""
 "\n"
 "라이선스: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 스펙트럼 분석기"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "그놈 바로가기"
@@ -1440,8 +1519,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "항목 번호"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "제목"
@@ -1498,8 +1577,8 @@ msgstr "존재하는 내용"
 msgid "Displayed columns"
 msgstr "표시한 내용"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "검색 도구"
 
@@ -1527,335 +1606,338 @@ msgstr "떼어내기"
 msgid "Disable"
 msgstr "비활성화"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "파일 열기(_O) ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "URL 열기(_U) ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "파일 추가(_A) ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "URL 추가(_R) ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "라이브러리 검색(_L)"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "정보(_B) ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "설정(_S)..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "끝내기(_Q)"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "재생(_P)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "일시정지(_E)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "정지(_S)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "이전(_V)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "반복(_R)"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "뒤섞기(_H)"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "재생 목록 미리 알리지 않음(_O)"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "이 노래 다음 멈춤(_F)"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "곡 정보(_I) ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "시간 건너뛰기(_T) ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "곡 건너뛰기(_J) ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "반복 시점 A 설정(_A)"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "반복 시점 B 설정(_B)"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "반복 시점 지우기(_C)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "제목순(_T)"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "파일 이름순(_F)"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "파일 경로 순(_P)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "트랙 번호순(_N)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "음악가 이름순(_A)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "앨범 이름순(_B)"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "앨범 작곡가순(_M)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "출시 일자순(_D)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "장르순(_G)"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "길이순(_L)"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "파일 경로순(_F)"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "사용자 정의 제목순(_C)"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "순서 뒤집기(_E)"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "임의 순서(_R)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "재생/복귀(_P)"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "정렬(_S)"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "선택한 항목 정렬(_L)"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "중복 제거(_D)"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "사용할 수 없는 파일 제거(_U)"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "새 파일(_N)"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "이름 바꾸기(_A)..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "제거(_V)"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "가져오기(_I) ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "내보내기(_E) ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "재생 목록 관리자(_M) ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "대기 목록 관리자(_Q) ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "음량 크게(_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "음량 작게(_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "효과(_F)..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "메뉴 표시줄 표시(_M)"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "정보 표시줄 표시(_N)"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "정보 표시줄 시각화 표시(_U)"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "상태 표시줄 표시(_S)"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "남은 시간 표시(_R)"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "시각화(_V)..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "파일(_F)"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "재생(_P)"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "재생 목록(_L)"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "서비스(_S)"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "출력(_O)"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "보기(_V)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "대기 목록에 넣기/빼기(_Q)"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "음악 포함 폴더 열기(_O)"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "이름 바꾸기(_R) ..."
 
@@ -1896,57 +1978,56 @@ msgstr "화살표 키로 탐색:"
 msgid "Scroll on song change"
 msgstr "곡 바뀔 때 스크롤"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK 인터페이스"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - 오데이셔스"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "버퍼링 ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "오데이셔스"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "모노"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "스테레오"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "채널 %d개"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "싱글 모드입니다."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "재생 목록 모드입니다."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "곡 재생 후 멈추는 중입니다."
 
@@ -1954,9 +2035,9 @@ msgstr "곡 재생 후 멈추는 중입니다."
 msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "재생"
 
@@ -1964,8 +2045,8 @@ msgstr "재생"
 msgid "Pause/Resume"
 msgstr "일시 정지/재개"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "정지"
 
@@ -2064,7 +2145,7 @@ msgstr "<b>키 바인딩:</b>"
 msgid "_Add"
 msgstr "추가(_A)"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "전역 단축키"
 
@@ -2094,35 +2175,35 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK 출력"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "출력 포트로 자동 연결"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2221,48 +2302,48 @@ msgstr "LIRC 서버에 다시 연결"
 msgid "Wait before reconnecting:"
 msgstr "다시 연결하기 전에 대기중:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki 플러그인"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "가사가 없습니다."
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "오류"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s을(를) 가져올 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s을(를) 해석할 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "가사 검색중..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "곡 메타데이터가 빠졌습니다"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "lyrics.wikia.com에 연결 중..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2274,17 +2355,17 @@ msgstr "M3U 재생 목록"
 msgid "Tact Generator"
 msgstr "Tact 생성기"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact 생성기: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact 생성기: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2439,15 +2520,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 플러그인"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>고급</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "서라운드"
 
@@ -2459,35 +2540,35 @@ msgstr "MPRIS 2 서버"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS 플러그인"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "알 수 없는 HTTP 오류"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "URL 해석 오류"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "정지함"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "오데이셔스가 재생중이 아닙니다."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "데스크톱 알림"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2521,15 +2602,15 @@ msgstr ""
 "이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다. 만약 사본"
 "이 없다면 <http://www.gnu.org/licenses/> 링크를 참조하십시오."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "재생 컨트롤 표시"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "항상 알림 표시"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2537,21 +2618,21 @@ msgstr ""
 msgid "Show"
 msgstr "보이기"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "일시 정지"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "다음"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 출력"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 출력"
 
@@ -2593,23 +2674,23 @@ msgstr ""
 "#audacious 채널 사람, 특히 Tony Vroon, John Lindgren, 이전에 OSS 플러그인을 "
 "만든 저작자분께 감사드리고 싶습니다."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "재생 목록 관리자"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "항목"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "이름 바꾸기(_A)"
 
@@ -2621,48 +2702,34 @@ msgstr "PLS 재생 목록"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 디코더"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio 출력"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"오데이셔스 펄스오디오 출력 플러그인\n"
-"\n"
-"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 발표한\n"
-"GNU 일반 공중 사용허가서 2판(또는 여러분의 선택에 따라) 이상의\n"
-"조항에 따라 재배포 또는 수정할 수 있습니다.\n"
-"\n"
-"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는\n"
-"상업적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다.\n"
-"자세한 내용은 GNU 일반 공중 사용허가서를 보십시오.\n"
-"\n"
-"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다.\n"
-"만약 사본이 없다면 자유 소프트웨어 재단에 요청하십시오.\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 출력"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2676,47 +2743,64 @@ msgstr ""
 "오데이셔스용 SDL 출력 플러그인 기반임\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "동작중 ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "검색"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "폴더 열기(_O)..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "폴더 추가(_A)..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "로그 감시기(_L)..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "파일 열기"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "파일 추가"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "이전"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "반복"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "뒤섞기"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "폴더 열기(_O)..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "폴더 추가(_A)..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "로그 감시기(_L)..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt 인터페이스"
 
@@ -2760,7 +2844,7 @@ msgstr "<b>변환</b>"
 msgid "Method:"
 msgstr "방식:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "주파수:"
 
@@ -2812,56 +2896,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "네. %s 사용자의 스크로블링을 진행합니다"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "권한이 거부되었습니다"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
-"재생 항목을 오데이셔스에서 스크롤 하도록 하려면 다음 연결을 방문하십시오:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "이 창을 연 상태로 다시 '권한 확인'을 누르십시오.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"걱정하지 마십시오. 스크로블을 컴퓨터에 저장했습니다.\n"
-"오데이셔스가 동작할 수 있는대로 바로 제출합니다."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "네트워크에 문제가 있습니다."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm에 연결하는데 문제가 있습니다. 다시 시도해 주십시오."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "확인중..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "권한 확인(_H)"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "권한 취소(_R)"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "오데이셔스가 Last.fm 계정에 트랙을 추출할 수 있게 해야 합니다.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2892,7 +2962,7 @@ msgstr ""
 "이 프로젝트를 시작하는데 도움을 준 John Lindgren에게 감사드립니다.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2900,11 +2970,11 @@ msgstr ""
 "Audacious가 이제부터 Last.fm 스크로블러 개선 버전을 사용중입니다.⏎\n"
 "스크로블러 플러그인의 기본 설정을 확인하십시오."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 출력"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2912,55 +2982,55 @@ msgstr ""
 "오데이셔스용 SDL 출력 플러그인\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "라이브러리"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "결과 %d개"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(숨긴 항목 %d개)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "노래 %d곡"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ": 이 장르에 해당"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "재생 목록 만들기(_C)"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "재생 목록 추가하기(_A)"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "라이브러리 검색"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2968,11 +3038,11 @@ msgstr ""
 "음악 라이브러리를 오데이셔스로 가져오려면 폴더를 선택하고 \"새로고침\"아이콘"
 "을 누르십시오."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "기다려 주십시오 ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "폴더 선택"
 
@@ -3066,15 +3136,15 @@ msgstr ""
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "반복 시점을 지웠습니다."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "A 반복 시점을 설정했습니다."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "B 반복 시점을 설정했습니다."
 
@@ -3126,373 +3196,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "오데이셔스 이퀄라이저"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "%d 탐색:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "음량: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "균형: %d%% 왼쪽"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "균형: 가운데"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "균형: %d%% 오른쪽"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "옵션 메뉴"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "'항상 위' 비활성화"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "'항상 위' 활성화"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "파일 정보 상자"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "두배 길이"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "파일 열기..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "URL 열기..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "라이브러리 검색"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "재생"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "재생 목록"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "보기"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "서비스"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "정보..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "설정..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "곡 정보..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "이전 재생목록이 없습니다"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "이 곡 다음 멈춤"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "A-B 반복 설정"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "A-B 반복 지우기"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "지정 곡으로 건너뛰기..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "지정 시간으로 건너뛰기..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "재생/재개"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "새 재생 목록"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "재생 목록 제거..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "재생 목록 제거"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "이전 재생 목록"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "다음 재생 목록"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "재생 목록 가져오기..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "재생 목록 내보내기..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "재생 목록 관리자..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "큐 관리자..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "재생 목록 새로 고침"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "재생 목록 편집기 표시"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "이퀄라이저 표시"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "남은 시간 표시"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "항상 위"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "모든 작업 공간에 표시"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "재생 프로그램 말아 올리기"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "재생 목록 편집기 말아 올리기"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "이퀄라이저 말아 올리기"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "URL 추가..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "파일 추가..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "제목별"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "파일 이름별"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "파일 경로순"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "모두 제거"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "대기 목록 지우기"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "사용할 수 없는 파일 제거"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "복제본 제거"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "선택하지 않은 항목 제거"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "선택한 항목 제거"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "검색하고 선택"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "선택 반전"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "선택하지 않음"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "모두 선택"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "트랙 번호순"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "음악가순"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "앨범 제목순"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "앨범 음악가별"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "출시일자순"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "장르별"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "길이별"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "지정 제목별"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "목록 순서 뒤섞기"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "목록 순서 뒤집기"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "선택한 항목 정렬"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "목록 정렬"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "잘라내기"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "복사"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "큐에 넣기/큐에서 빼기"
 
@@ -3505,15 +3583,15 @@ msgstr "오데이셔스 재생 목록 편집기"
 msgid "%s (%d of %d)"
 msgstr "%1$s (%3$d중 %2$d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp 클래식 인터페이스"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "폴더 열기..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "폴더 추가..."
 
@@ -3601,7 +3679,7 @@ msgid "Slow"
 msgstr "느리게"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "중간"
 
@@ -3736,7 +3814,7 @@ msgstr "일치하는 항목에 대해 새 재생 목록 만들기"
 msgid "Sndfile Plugin"
 msgstr "Sndfile 플러그인"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3775,66 +3853,66 @@ msgstr ""
 "이 없다면 자유 소프트웨어 재단에 요청하십시오. 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "sndio 출력"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "장치(빈 값이 기본값):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "저장하고 되돌릴 음량:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "곡 바꾸기"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3849,21 +3927,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 리샘플러"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3877,43 +3955,43 @@ msgstr ""
 "샘플 주파수 변환 플러그인을 기반으로 하였습니다:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "빠름"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "낮음"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "높음"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "매우 높음"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "음질:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "속도와 피치"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>속도와 피치</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "속도:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "피치:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "상태 아이콘"
 
@@ -4009,12 +4087,12 @@ msgstr "<b>엑스트라 스테레오</b>"
 msgid "Tone Generator"
 msgstr "톤 생성기"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "톤 생성기:"
 
@@ -4037,7 +4115,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "육성 제거"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4103,7 +4181,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX 디코더"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4113,19 +4191,29 @@ msgstr ""
 "Roman Sherbakov <v_soft@microfor.ru>의 in_vtx.dll을 기반으로 함\n"
 "Pavel Vymetalek <pvymetalek@seznam.cz>이 오데이셔스 플러그인 제작"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack 디코더"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "손실(혼성)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "손실"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4139,31 +4227,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF 디코더"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 공유 가능 재생 목록(XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "곡이 다른 채널 수를 가지고 있어 크로스페이딩에 실패했습니다. 채널 믹서를 "
-#~ "사용하여 동일한 채널 수를 가지도록 곡을 변환할 수 있습니다."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "곡이 다른 샘플 주파수를 가지고 있어 크로스페이딩에 실패했습니다. 샘플 주파"
-#~ "수 변환기를 사용하여 동일한 샘플 주파수를 가지도록 곡을 변환 할 수 있습니"
-#~ "다."
diff --git a/po/ky.po b/po/ky.po
index dcab2d9..dc57b23 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,10 +7,10 @@
 # chingis, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Kyrgyz (http://www.transifex.com/jlindgren/audacious/language/"
 "ky/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -28,27 +28,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib ойноткучу)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Ойготкуч саат"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -99,147 +99,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Эске салуу"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Дүйшөмбү"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Шейшемби"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Шаршемби"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Бейшемби"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Жума"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Ишемби"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Жекшемби"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Убакыт"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "с"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr ""
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "саат"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "мүнөт"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Күн"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Жарыяланбас"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Күндөр"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Басаңчалоо"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунда"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Катуулук"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Аяктоо"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Кезектеги"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Кошумча команда"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "күйгүзүү"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Ойнотуу тизмесин тандаңыз"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опциялар"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Жардам"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Альбом тышы"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA чыгышы"
 
@@ -276,11 +276,11 @@ msgstr "Микшер орнотмосу:"
 msgid "Mixer element:"
 msgstr "Микшер элементи:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -303,68 +303,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -372,86 +372,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Файл аты"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Өлчөм (байт)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Аты:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI маалыматы </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Узундук (мс):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "өзгөрмө"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI комментарийлер жана сөздөрү </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Жабуу"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (туура эмес UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -463,7 +477,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -515,154 +529,150 @@ msgstr ""
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Турган жери"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Шрифттер"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Көлөкө"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Түстөр"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Окуя"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Тунуктук"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Орун"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -678,11 +688,11 @@ msgstr "ASXv1/ASXv2 ойнотуу тизмелери"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious ойнотуу тизмелери (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Түс</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Күңүрт диапазон"
 
@@ -706,15 +716,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Спектр талдагычы"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Аудио CD плагини"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -726,118 +736,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Орнотмо</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Окуу ылдамдыгы:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метамаалымат</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "CD-Text колдонуу"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB колдонуу"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Жол:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Аудио CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "%s CD орнотмосун ачуу оңунан чыккан жок."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -990,58 +1000,60 @@ msgstr "Интенсивдүүлүк:"
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Өчүрүү"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Айнуу"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1079,11 +1091,11 @@ msgstr "Катуулук:"
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg плагини"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1093,15 +1105,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Каталогду тандоо"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1118,194 +1126,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Чыгыш файл форматы:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Негизги"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Автоматтуу"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Алгоритм сапаты:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Гц)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Битрейт (кбит/с):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Аудио режими:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Каталардан коргоо"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Сапат"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR күйгүзүү"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Түр:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR параметрлери:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Төмөнчек битрейти (кбит/с):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Жогорчек битрейти (кбит/с):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR параметрлери:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Орточо битрейт (кбит/с):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR сапат деңгээли:"
 
-#: src/filewriter/mp3.cc:920
-msgid "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:526
+msgid "Omit Xing VBR header"
+msgstr ""
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Автордук укук менен корголгон деп белгилөө"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Оригинал деп белгилөө"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Сапат"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Тегдер"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Сапат деңгээли (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Негизги"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC декодери"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1313,25 +1405,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO плагини"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1343,23 +1435,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1376,8 +1455,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Жазуунун номери"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Ат"
@@ -1434,8 +1513,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Издөө аспабы"
 
@@ -1463,335 +1542,338 @@ msgstr ""
 msgid "Disable"
 msgstr "Өчүрүү"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Файлдарды _ачуу ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "_URL ачуу ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Файлдарды _кошуу ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL кошуу ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "Программа _жөнүндө ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Чыгуу"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Ойнотуу"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Пауза"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Токтотуу"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Мурунку"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Кийинки"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Кайталоо"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Иретсиз"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Тизмеден жылдырбоо"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Ыр _маалыматы ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_Убакытка өтүү ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Ырга өтүү ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "_Ат боюнча"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Трек _номери боюнча"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_Аткаруучу боюнча"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Чыгаруу _күнү боюнча"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "_Файлдын турган жери боюнча"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "_Тапшырылма ат боюнча"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Тескери тартип менен"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Аралаш тартип менен"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Жаңылоо"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Сорттоо"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_Кол жеткис файлдарды өчүрүү"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Жаңы"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Атын _өзгөртүү..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Импорт ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Экспорт ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Ойнотуу тизмесинин _менеджери..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Кезек менеджери ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Катуулукту _көбөйтүү"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Катуулукту _азайтуу"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Меню панелин көрсөтүү"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "М_аалымат панелин көрсөтүү"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_Абал панелин көрсөтүү"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Ойнотуу"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Тизме"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Кызматтар"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Чыгыш"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "Кө_рүнүш"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Кезекке коюу/койбоо"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Ке_сүү"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Көчүрүү"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "К_оюу"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_Баарын тандоо"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Атын өзгөртүү ..."
 
@@ -1832,57 +1914,56 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK интерфейс"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Буферизация ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d канал"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/с"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Бириндеген режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Ойнотуу тизмеси режими."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Ырдан кийин токтотуу."
 
@@ -1890,9 +1971,9 @@ msgstr "Ырдан кийин токтотуу."
 msgid "Previous track"
 msgstr "Мурунку жолчо"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Ойнотуу"
 
@@ -1900,8 +1981,8 @@ msgstr "Ойнотуу"
 msgid "Pause/Resume"
 msgstr "Пауза/Улантуу"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Токтотуу"
 
@@ -1995,7 +2076,7 @@ msgstr "<b>Клавиштик айкалыш:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2014,35 +2095,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK чыгышы"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2125,48 +2206,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki плагини"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Ыр тексти кол жеткис"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Ката"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Ыр текстин издөө ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Ыр метамаалыматтары жок болуу"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2178,17 +2259,17 @@ msgstr "M3U ойнотуу тизмелери"
 msgid "Tact Generator"
 msgstr "Такт генератору"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2336,15 +2417,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 плагини"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Көлөмдүү тыбыш"
 
@@ -2356,35 +2437,35 @@ msgstr "MPRIS 2 сервери"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS плагини"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Токтолгон"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious ойнотуп жаткан жок."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2404,15 +2485,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2420,21 +2501,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Кийинки"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 чыгышы"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2471,23 +2552,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2499,35 +2580,34 @@ msgstr "PLS ойнотуу тизмелери"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 чыгышы"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio чыгышы"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2536,47 +2616,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Мурунку"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Кайталоо"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Иретсиз"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2618,7 +2715,7 @@ msgstr "<b>Конверсия</b>"
 msgid "Method:"
 msgstr "Ыкма:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Жыштык:"
 
@@ -2670,52 +2767,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Тармак көйгөйү."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Текшерилүүдө..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2739,71 +2825,71 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL чыгышы"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Абазкана"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "Ойнотуу тизмесин _жаратуу"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Ойнотуу тизмесине _кошуу"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Издөө абазканасы"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2811,11 +2897,11 @@ msgstr ""
 "Audacious абазканасына музыкаңызды импорт кылыш үчүн, биринчи каталогду "
 "тандаңыз, анан \"жаңыртуу\" деген иконканы басыңыз."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Каталогду тандаңыз"
 
@@ -2909,15 +2995,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2969,373 +3055,381 @@ msgstr "16 кГц"
 msgid "Audacious Equalizer"
 msgstr "Audacious эквалайзери"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Катуулук: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Балансы: %d%% сол"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Балансы: %d%% оң"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Параметрлер менюсу"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "\"Дайыма үстүндө\"нү өчүрүү"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "\"Дайыма үстүндө\"нү күйгүзүү"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Файл жөнүндө маалымат"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Ойнотуу"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Ойнотуу тизмеси"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Көрүнүш"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Жаңы ойнотуу тизмеси"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Ойнотуу тизмесинин редакторун көрсөтүү"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "_Эквалайзерди көрсөтүү"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Дайыма үстүндө"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Ат боюнча"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Баарын өчүрүү"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Кезекти тазалоо"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Кол жеткис файлдарды өчүрүү"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Дубликаттарды өчүрүү"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Тандалбагандарды өчүрүү"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Тандалгандарды өчүрүү"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Издеп анан тандоо"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Тандалганды тескерилетүү"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Тандоону алуу"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Баарын тандоо"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Жолчо номерлери боюнча"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Аткаруучу боюнча"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Альбом боюнча"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Тизмени аралаштыруу"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Тизмени тескерилетүү"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Тандалгандарды сорттоо"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Тизмени сорттоо"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Кесүү"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Көчүрүү"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Коюу"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3348,15 +3442,15 @@ msgstr "Audacious ойнотуу тизмесинин редактору"
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp классикалык интерфейси"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3444,7 +3538,7 @@ msgid "Slow"
 msgstr "Жай"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Орточо"
 
@@ -3576,7 +3670,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr "Sndfile плагини"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3598,66 +3692,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Ыр которуу"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3672,21 +3766,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3695,43 +3789,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Сапаты:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Ылдамдык жана бийиктик"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Ылдамдык жана бийиктик</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Ылдамдык:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Бийиктик:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Статус иконкасы"
 
@@ -3817,12 +3911,12 @@ msgstr "<b>Экстра стерео</b>"
 msgid "Tone Generator"
 msgstr "Тон генератору"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Тон генератору: "
 
@@ -3839,7 +3933,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3888,26 +3982,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX декодери"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack декодери"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3918,14 +4022,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF декодери"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 94a7a5a..c933aff 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,10 +10,10 @@
 # gymka <gymka@mail.ru>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/jlindgren/audacious/"
 "language/lt/)\n"
@@ -24,7 +24,7 @@ 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"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) Dekoderis"
 
@@ -32,20 +32,20 @@ msgstr "AAC (Raw) Dekoderis"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib grotuvas)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "nuoseklus"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Žadintuvas"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Nustatyti perspėjimą..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Originaliai parašė Adam Feakin ir Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -106,147 +106,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Tai pabudimo skambutis."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Šiandienos priminimas..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Priminimas"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Laikas"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Žadinti (numatyta):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "v"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Nutildyti po:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "valandos"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutės"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Pasirinkite dienas kuriomis žadinti"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Diena"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Numatytosios"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dienos"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Išblukimas"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekundės"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Garsas"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Pradėti nuo"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Baigti"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Dabartinis"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Papildoma komanda"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "Įjungti"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Grojaraštis (nebūtina)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Pasirinkite grojaraštį"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Pasirinktys"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Ką šios pasirinktys reiškia?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Žinynas"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albumo apipavadalinimas"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA išvestis"
 
@@ -288,11 +288,11 @@ msgstr "Mikšerio įrenginys:"
 msgid "Mixer element:"
 msgstr "Mikšerio elementas:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI grotuvas)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -315,68 +315,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Perrašyti numatytąjį garsą:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Perrašyti numatytąją polifoniją:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Perrašyti numatytąjį aidą:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Įjungta"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Perrašyti numatytąjį chorą:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Atkūrimas</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Perkėlimas:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Būgnų poslinkis:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintezatorius</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -384,86 +384,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pasirinkite SoundFont failą"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Atverti"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Bylos vardas"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Dydis (bitais)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formatas:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Trukmė (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Takelių:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "kintamasis"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Laiko div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI komentarai ir žodžiai</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* Šiame MIDI faile nėra komentarų *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Šiame MIDI faile nėra žodžių *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Uždaryti"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (neteisingas UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -482,7 +496,7 @@ msgstr ""
 "Paremta Evan Martin Ghosd biblioteka:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Rodymas ekrane)"
 
@@ -534,94 +548,94 @@ msgstr "Pauzė išjungiama"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Sužadina OSD kai atkūrimas atkuriamas po pauzės."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Padėtis"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Reliatyvus X poslinkis:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Reliatyvus Y poslinkis:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Didžiausias OSD plotis:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Kelių vaizduoklių pasirinktys"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Vaizduoklis naudoja OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "visi vaizduokliai"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "vaizduoklis %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Laiko derinimas (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Monitorius:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Nustelbti:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Išblukti:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Šriftas %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Šešėlis"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Atvaizdavimo stilius"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Spalva %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Sužadinti"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Įvykis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Kompozicionavimo tvarkyklė aptikta"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -630,60 +644,56 @@ msgstr ""
 "Kompozicionavimo tvarkyklė nerasta;\n"
 "įjunkite kompozicionavimo tvarkyklę, nes OSD neveiks taip kaip priklauso"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Netikram permatomumui kompozicionavimo tvarkyklė nebūtina"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Permatomumas"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Netikras permatomumas"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tikras permatomumas (reikalinga X kompozicionavimo plėtinys)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Kompozicionavimo plėtinys neįkrautas"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozicionavimo plėtinys neprieinamas"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Pozicija"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animacija"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekoracijos"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Sužadintojas"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Kita"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -699,11 +709,11 @@ msgstr "ASXv1/ASXv2 grojaraščiai"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious grojaraščiai (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Spalva</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Išsiliejimo sritis"
 
@@ -727,15 +737,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "Nukirpti dažnius:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektro analizatorius"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD įskiepis"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -755,118 +765,118 @@ msgstr ""
 "\n"
 "Tai buvo Google Summer Code 2007 projektas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Įrenginys</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Skaitymo greitis:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Perrašyti įrenginį:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Meta duomenys</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Naudoti CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Naudoti CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Naudoti HTTP vietoj CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Kelias:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Inicijuoti cdio posistemės nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Netinkamas URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Takelis %d nerastas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Takelis %d yra duomenų takelis."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Klaida skaitant audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Atverti CD įrenginio %s nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "CD įrenginio suderinamo su audio nerasta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepavyko užbaigti inicijuoto atverto CD įrenginio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Gauti pirmo/paskutinio takelio numerio nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Perskaityti LSN takelio %d pradžios/pabaigos nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Sukurti cddb sujungimo nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Užlausti CDDB serverio nepavyko"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Užlausti CDDB serverio nepavyko: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Perskaityti cddb informaciją nepavyko: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Diskasukis tuščias."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nepalaikomas disko tipas."
 
@@ -1025,58 +1035,60 @@ msgstr "Intensyvumas:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet įskiepis"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Pašalinti failus"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Klaida perkeliant %s į šiukšlinę: %s"
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Klaida šalinant %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Klaida šalinant %s: ne vietinis failas."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Ar tikrai norite perkelti pasirinktus failus į šiukšliadėžę?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Perkelti į šiukšlinę"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktus failus?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Pašalinti pasirinktus failus"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Šalinimo metodas</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Perkelti į šiukšlinę, iškart nepašalinti"
 
@@ -1114,11 +1126,11 @@ msgstr "Garsumas:"
 msgid "Echo"
 msgstr "Aidas"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg įskiepis"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1134,15 +1146,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter įskiepis"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Pasirinkite aplanką"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1159,194 +1167,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Išvesties failo formatas:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Išsaugoti originalo aplanke"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Pagrindinės"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Sujungtas stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritmo kokybė:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitų dažnis(kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Kompresijos santykis:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audio režimas:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Apsauga nuo klaidų"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kokybė"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Įjungti VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipas:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR pasirinktys:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimalus bitų dažnis (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimalus bitų dažnis (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Griežtai laikytis minimalaus bitų dažnio"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR pasirinktys:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Vidutinis bitų dažnis (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR kokybės lygis:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Griežtai laikytis minimalaus bitų dažnio"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Pažymėti kaip saugomą autorinių teisių"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Pažymėti kaip originalą"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Priverstinai pridėti 2 versijos žymą"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Pridėti tik v1 žymą"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Pridėti tik v2 žymą"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kokybė"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Žymos"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kokybės lygis (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Pagrindinės"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC dekoderis"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1358,7 +1450,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1366,19 +1458,19 @@ msgstr ""
 "GIO įskiepis skirtas Audacious\n"
 "Autorinės teisės 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO įskiepis"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1398,23 +1490,10 @@ msgstr ""
 "\n"
 "License: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL spektro analizatorius"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1431,8 +1510,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Įrašo numeris"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Pavadinimas"
@@ -1489,8 +1568,8 @@ msgstr "Prieinami stulpeliai"
 msgid "Displayed columns"
 msgstr "Rodomų stulpelių sąrašas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Paieškos įrankis"
 
@@ -1518,335 +1597,338 @@ msgstr "Padidinti"
 msgid "Disable"
 msgstr "Išjungti"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Atverti failus ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Atverti _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Pridėti failus..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Pridėti U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Ieškoti _bibliotekoje"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "A_pie"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Nustatymai..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Groti"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Pauz_ė"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Sustabdyti"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Ankste_snis"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Sekantis"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Kartoti"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "S_umaišyti"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_esislinkti grojaraščiu"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Sustabdyti _po šios dainos"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Dainos _informacija ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Šokti į _laiką"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Pereiti prie dainos ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Nustatyti kartojimo tašką _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Nustatyti kartojimo tašką _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Išvalyti kartojimo taškus"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Pagal _pavadinimą"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Pagal failo _kelią"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Pagal takelio _numerį"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Pagal _atlikėją"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Pagal _albumą"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Pagal išleidimo _datą"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Pagal _trukmę"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Pagal _failo kelią"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Pagal _derintą eilutę"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "A_tvirkštine tvarka"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Atsitiktine tvarka"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Rikuoti _pasirinktus"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Pašalinti _dubliuotus"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Pašalinti _neprieinamus failus"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Naujas"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Pervadinti"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Šalinti"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Įkelti ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Eksportuoti ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Grojaraščio _redaktorius"
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Eilės redaktorius ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Pagarsi_nti"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Patil_dyti"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fektai..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Rodyti _meniu juostą"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Rodyti i_nfo juostą"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Rodyti informacijos juostos _vizualizaciją"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Rodyti _būsenos juostą"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "_Rodyti likusį laiką"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Vaizdiniai..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Failas"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "G_rojaraštis"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Tarnybos"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Išvestis"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Rodymas"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Į eilę/Iš eilės"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Iškirpt_i"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Įklijuoti"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Pasirinkti _viską"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Pervadinti..."
 
@@ -1887,33 +1969,32 @@ msgstr "Krypčių klavišai persuka:"
 msgid "Scroll on song change"
 msgstr "Keičiantis dainai slinkti"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK naudotojo sąsaja"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Įkraunama į atmintį ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1921,25 +2002,25 @@ msgstr[0] "%d kanalas"
 msgstr[1] "%d kanalai"
 msgstr[2] "%d kanalų"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Vieno režimas."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Grojaraščio režimas."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Sustabdymas po dainos."
 
@@ -1947,9 +2028,9 @@ msgstr "Sustabdymas po dainos."
 msgid "Previous track"
 msgstr "Ankstesnis takelis"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Groti"
 
@@ -1957,8 +2038,8 @@ msgstr "Groti"
 msgid "Pause/Resume"
 msgstr "Sustabdyti/Paleisti"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stabdyti"
 
@@ -2057,7 +2138,7 @@ msgstr "<b>Klavišo susiejimas:</b>"
 msgid "_Add"
 msgstr "_Pridėti"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Bendri karštieji klavišai"
 
@@ -2087,35 +2168,35 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK išvestis"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2216,48 +2297,48 @@ msgstr "Iš naujo prisijungti prie LIRC serverio"
 msgid "Wait before reconnecting:"
 msgstr "Prieš jungiantis iš naujo palaukti:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki įskiepis"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Nėra prieinamų dainų žodžių"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Klaida"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Gauti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Apdoroti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Ieškoma dainų žodžių"
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Trūksta dainos metaduomenų"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Jungiamasi prie lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2269,17 +2350,17 @@ msgstr "M3U grojaraščiai"
 msgid "Tact Generator"
 msgstr "Takto generatorius"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takto generatorius: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takto generatorius: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2433,15 +2514,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 įskiepis"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Sudėtingesni</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Erdvinis garsas"
 
@@ -2453,35 +2534,35 @@ msgstr "MPRIS 2 Serveris"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS įskiepis"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Sustabdyta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious negroja."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Darbastalio pranešimai"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2517,15 +2598,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Rodyti atkūrimo valdymą"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Visada rodyti pranešimą"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2533,21 +2614,21 @@ msgstr ""
 msgid "Show"
 msgstr "Rodyti"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pauzė"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Sekantis"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 išvestis"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2589,23 +2670,23 @@ msgstr ""
 "Norėčiau padėkoti žmonėms #audacious kanale, ypatingai Tony Vroon ir John "
 "Lindgren ir savaime aišku ankstesnės OSS įskiepio versijos autoriams."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2617,51 +2698,34 @@ msgstr "PLS grojaraščiai"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekoderis"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio išvestis"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio Output Plugin\n"
-"\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"
-"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,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2670,47 +2734,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr ""
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Ieškoti"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Maišyti"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2754,7 +2835,7 @@ msgstr "<b>Konvertavimas</b>"
 msgid "Method:"
 msgstr "Metodas:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Dažnis:"
 
@@ -2806,58 +2887,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Gerai. Ieškoma informacijos naudotojui: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Neleidžiama"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Nueikite šia nuoroda ir leiskite Audacious gauti informaciją apie dainas:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Palikite šį langą atvertą ir paspauskite „Tikrinti leidimus“ dar kartą.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Nesijaudinkite. Jūsų informacija saugoma kompiuteryje.\n"
-"Ji bus išsiųsta kai tik Audacious leis tai padaryti."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Tinklo problema."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Bandant susisiekti su Last.fm įvyko klaida. Pabandykite vėliau."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Tikrinama..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Tikrinti leidimus"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Atšaukti leidimą"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Turite leisti Audacious perduoti takelių informaciją jūsų Last.fm paskyrai.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2888,7 +2953,7 @@ msgstr ""
 "Dėkojame John Lindgren už pagalbą.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2896,11 +2961,11 @@ msgstr ""
 "Nuo šiol audacious naudoja patobulintą last.fm apdoroklio versiją.\n"
 "Pažiūrėkite apdoroklio nustatymuose."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL išvestis"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2908,13 +2973,13 @@ msgstr ""
 "SDL Output Plugin skirtas Audacious\n"
 "Autorinės teisės 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Fonoteka"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -2922,7 +2987,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -2930,7 +2995,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2938,31 +3003,31 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Sukurti grojaraštį"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Pridėti į grojaraštį"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Ieškoti fonotekoje"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2970,11 +3035,11 @@ msgstr ""
 "Norėdami importuoti muziką į Audacious fonoteką, pasirinkite aplanką ir "
 "paspauskite „atnaujinti“ piktogramą."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Palaukite..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Pasirinkite aplanką"
 
@@ -3068,15 +3133,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Kartojimo taškai išvalyti."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Kartojimo taškas A nustatytas."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Kartojimo taškas B nustatytas."
 
@@ -3128,373 +3193,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious ekvalaizeris"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Garsumas: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansas: %d%% kairė"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balansas: centras"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansas: %d%% dešinė"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Pasirinkčių meniu"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Išjungti „Visada viršuje“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Įjungti „Visada viršuje“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Failo informacijos langas"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Atverti failus..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Atverti URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Rodymas"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Tarnybos"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Apie..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Nustatymai..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Dainos informacija..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Nesislinkti grojaraščiu"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Sustabdyti po šios dainos"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Nustatyti A-B kartojimą"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Išvalyti A-B kartojimą"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Pereiti prie dainos ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Šokti į laiką..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Naujas grojaraštis"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Pervadinti grojaraštį..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Pašalinti grojaraštį"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Ankstesnis grojaraštis"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Sekantis grojaraštis"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Įkelti grojaraštį..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Eksportuoti grojaraštį..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Grojaraščių redaktorius..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Eilės redaktorius ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Atnaujinti grojaraštį"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Rodyti grojaraščio redaktorių"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Rodyti ekvalaizerį"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Rodyti likusį laiką"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Visada viršuje"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Visuose darbalaukiuose"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Sustumti grotuvą"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Sustumti grojaraščio redaktorių"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Sustumti ekvalaizerį"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Pridėti URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Pridėti failus..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Pagal pavadinimą"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Pagal failo kelią"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Pašalinti visus"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Išvalyti eilę"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Pašalina neprieinamus failus"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Pašalinti dubliuotus"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Pašalint nepažymėtus"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Pašalint pažymėtus"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Ieškoti ir pasirinkti"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertuoti pažymėjimą"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Nieko nepasirinkti"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Pasirinkti viską"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Pagal takelio numerį"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Pagal atlikėją"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Pagal albumą"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Pagal išleidimo datą"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Sumaišyti sąrašą"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Apversti sąrašą"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Rikuoti pasirinktus"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Rikiuoti sąrašą"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Įklijuoti"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Į eilę/Iš eilės"
 
@@ -3507,15 +3580,15 @@ msgstr "Audacious grojaraščio redaktorius"
 msgid "%s (%d of %d)"
 msgstr "%s (%d iš %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Klasikinė Winamp sąsaja"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3603,7 +3676,7 @@ msgid "Slow"
 msgstr "Lėtas"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Vidutinis"
 
@@ -3739,7 +3812,7 @@ msgstr "Iš surastų įrašų sukurti naują grojaraštį"
 msgid "Sndfile Plugin"
 msgstr "Sndfile įskiepis"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3779,66 +3852,66 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Dainos keitimas"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3853,21 +3926,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3878,43 +3951,43 @@ msgstr ""
 "SoX Resampler įskiepis skirtas Audacious⏎ Copyright 2013 Michał Lipski⏎ ⏎ "
 "Paremta Sample Rate Converter įskiepiu:⏎ Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Greita"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Žema"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Aukšta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Labai aukšta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kokybė:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Greitis ir žingsnis"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Greitis ir žingsnis</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Žingsnis:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Būsenos piktograma"
 
@@ -4010,12 +4083,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Tono generatorius"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Tono generatorius: "
 
@@ -4037,7 +4110,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Balso pašalinimas"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4103,7 +4176,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Decoder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4113,19 +4186,29 @@ msgstr ""
 "Paremta in_vtx.dll kurį sukūrė Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious įskiepį sukūrė Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack dekoderis"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "lossy (hibridinis)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4139,14 +4222,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF dekoderis"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML viešinami grojaraščiai (XSPF)"
diff --git a/po/lv.po b/po/lv.po
index 03829c8..b2ed2a8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# hairy_latvian <einars8@gmail.com>, 2013-2015
+# hairy_latvian <einars8@gmail.com>, 2013-2016
 # hairy_latvian <einars8@gmail.com>, 2009,2011-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-01 14:26+0000\n"
+"Last-Translator: hairy_latvian <einars8@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/jlindgren/audacious/"
 "language/lv/)\n"
 "Language: lv\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (jēldati) dekodētājs"
 
@@ -29,20 +29,20 @@ msgstr "AAC (jēldati) dekodētājs"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib atskaņotājs)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sekvencēts"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Modinātājs"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Iestatīt signālu ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -52,7 +52,7 @@ msgstr ""
 "\n"
 "Sākotnējie autori: Adam Feakin un Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -150,147 +150,147 @@ msgstr ""
 "    ierakstiet atgādinājumu rāmītī un ieslēdziet pārslēgšanas\n"
 "    pogu, ja vēlaties, lai atgādinājumu parāda."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Šis ir jūsu mošanās zvans."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Jūsu atgādinājums šodienai ir..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Laiks"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Modināt (noklusējums):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Kluss pēc:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "stundas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minūtes"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Diena"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Noklusētais"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dienas"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Izdzišana"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekundes"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Skaļums"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Sākumā"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Beigās"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Pašreizējais"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Papildu komanda"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "ieslēgt"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Repertuārs (neobligāts)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Izvēlieties repertuāru"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opcijas"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Ko šīs opcijas nozīmē?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Palīdzība"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albuma vāks"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA izvade"
 
@@ -332,11 +332,11 @@ msgstr "Miksera ierīce:"
 msgid "Mixer element:"
 msgstr "Miksera elements:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI atskaņotājs)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -377,68 +377,68 @@ msgstr ""
 "Tony Vroon\n"
 "par palīdzību alfa testēšanā"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Aizstāt noklusēto pastiprinājumu:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Aizstāt noklusēto polifoniju:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Aizstāt noklusēto atbalsi: "
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ieslēgts"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Aizstāt noklusēto kori:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Atskaņošana</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Pārlikt:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "pustoņi"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Bungu pārbīde:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "nošu numuri"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Izlaist klusumu sākumā"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Izlaist klusumu beigās"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintezators</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Iztveršanas temps:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -446,86 +446,106 @@ msgstr "Iztveršanas temps:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug — izvēlieties SoundFont failu"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Atcelt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Faila nosaukums"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Izmērs (baitos)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI informācija </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formāts:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Garums (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Celiņu skaits:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "mainīgais"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Laika dalītājs:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Komentāri un dziesmu vārdu teksti </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* komentāri šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* dziesmu vārdu teksti šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Ai_zvērt"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (nederīgs UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache pārlūks"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache pārlūks\n"
+"\n"
+"Ampache klients atskaņotājam Audacious.\n"
+"\n"
+"Licence: GNU GPLv3\n"
+"Autortiesības (C) Róbert Čerňanský un John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -544,7 +564,7 @@ msgstr ""
 "Daļēji balstīts uz Evan Martin Ghosd bibliotēku:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (virsekrāna displejs)"
 
@@ -596,94 +616,94 @@ msgstr "Pauze izslēgta"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Palaiž OSD, kad tiek atjaunota atskaņošana pēc pauzes."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relatīvā X nobīde:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relatīvā Y nobīde:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maksimālais OSD platums:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Daudzmonitoru opcijas"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Rādīt OSD izmantojot:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "visi monitori"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitors"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Ilgums (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Rādīt:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Parādīties:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Izgaist:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Fonti"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "%i. fonts:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Ēna"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Renderēšanas stils"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Krāsas"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "%i. krāsa:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Ieslēgt palaidēju"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Notikums"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Kompozitēšanas pārvaldnieks atrasts"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -693,60 +713,56 @@ msgstr ""
 "ja vien esat pārliecināts, ka jums tas ir palaists, lūdzu, aktivizējiet "
 "kompozitēšanas pārvaldnieku, citādi OSD nefunkcionēs pareizi"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Viltus caurspīdībai kompozitēšanas pārvaldnieks nav nepieciešams"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Caurspīdība"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Viltus caurspīdība"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Īsta caurspīdība (nepieciešams X Composite paplašin.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite paplašinājums nav ielādēts"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite paplašinājums nav pieejams"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animācija"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Teksts"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Noformējums"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Palaidējs"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Dažādi"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Testēt"
 
@@ -762,11 +778,11 @@ msgstr "ASXv1/ASXv2 repertuāri"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious repertuāri (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Krāsa</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -790,15 +806,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Nogriešanas frekvence:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektra analizators"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD spraudnis"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -818,118 +834,118 @@ msgstr ""
 "\n"
 "Šis bija Google Summer of Code 2007 projekts."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Ierīce</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Lasīšanas ātrums:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Aizstāt ierīci:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadati</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Lietot CD-text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Lietot CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Lietot HTTP nevis CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Ports:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Neizdevās inicializēt cdio apakšsistēmu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nederīgs URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Celiņš %d netika atrasts."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Celiņš %d ir datu celiņš."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Kļūda nolasot audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Neizdevās atvērt CD ierīci %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Netika atrasts CD dzinis ar audio atskaņošanas iespēju."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Neizdevās pabeigt inicializēt atvērtu CD dzini."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Neizdevās saņemt pirmā/pēdējā celiņa numuru."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Neizdevās nolasīt LSN sākumu/beigas celiņam %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Neizdevās izveidot cddb savienojumu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Neizdevās aptaujāt CDDB serveri."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Neizdevās aptaujāt CDDB serveri: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Neizdevās nolasīt cddb informāciju: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Dzinis ir tukšs."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Neatbalstīts diska tips."
 
@@ -1100,58 +1116,60 @@ msgstr "Intensitāte:"
 msgid "Crystalizer"
 msgstr "Kristalizators"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue lapas spraudnis"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Dzēst failus"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Kļūda pārvietojot %s uz miskasti: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Kļūda dzēšot %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Kļūda dzēšot %s: nav vietējais fails."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Vai vēlaties izvēlētos failus pārvietot uz miskasti?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Pārvietot uz miskasti"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Vai vēlaties izvēlētos failus dzēst uz visiem laikiem?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Dzēst"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Dzēst izvēlētos failus"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Dzēšanas metode</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Pārvietot uz miskasti nevis dzēst nekavējoties"
 
@@ -1194,11 +1212,11 @@ msgstr "Skaļums:"
 msgid "Echo"
 msgstr "Atbalss"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg spraudnis"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1214,15 +1232,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Failu rakstītāja spraudnis"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Izvēlieties mapi"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1251,194 +1265,278 @@ msgstr ""
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Izvades faila formāts:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Saglabāt oriģinālajā mapē"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Saglabāt pielāgotā mapē:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Ģenerēt faila nosaukumu no:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Oriģinālais faila nosaukums"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Oriģinālais faila nosaukums (bez sufiksa)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Oriģinālais faila tags"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Pievienot celiņa numuru faila nosaukumam"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Vispārīgi"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automātiski"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritma kvalitāte:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Izvades iztveršanas temps:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitātrums/Kompresijas attiecība:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Algoritma kvalitāte:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitātrums (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Bitātrums:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Kompresijas attiecība:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Audio režīms:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Dažādi:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Uzspiest stingru ISO savietojamību"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Kļūdu aizsardzība"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvalitāte"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Ieslēgt VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tips:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR opcijas:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimālais bitātrums (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimālais bitātrums (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Stingri uzspiest minimālo bitātrumu"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Minimālais bitātrums:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR opcijas:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Maksimālais bitātrums:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Vidējais bitātrums (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Vidējais bitātrums:"
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR kvalitātes līmenis:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Stingri uzspiest minimālo bitātrumu"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Atmest Xing VBR galveni"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Kadra parametri:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Kadru galvenes</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Atzīmēt kā autortiesībām aizsargātu"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Atzīmēt kā oriģinālu"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 parametri:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 tagi</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Uzspiest 2. versijas tagu pievienošanu"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Pievienot tikai 1. versijas tagu"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Pievienot tikai 2. versijas tagu"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvalitāte"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tagi"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kvalitātes līmenis (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Kvalitātes līmenis (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Vispārīgi"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC dekodētājs"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "bezzudumu"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1450,7 +1548,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1458,19 +1556,19 @@ msgstr ""
 "GIO spraudnis atskaņotājam Audacious\n"
 "Autortiesības 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO spraudnis"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Režīms lasīt-un-pievienot nav atbalstīts"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Neatļauts atvēršanas režīms"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1490,32 +1588,10 @@ msgstr ""
 "\n"
 "Licence: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL spektra analizators"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL spektra analizators atskaņotājam Audacious\n"
-"Autortiesības 2013 Christophe Budé, John Lindgren un Carlo Bramini\n"
-"Autortiesības 2014 William Pitcock\n"
-"\n"
-"Balstīts uz XMMS spraudni:\n"
-"Autortiesības 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson "
-"un 4Front Technologies\n"
-"\n"
-"Licence: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME īsceļi"
@@ -1536,8 +1612,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Ieraksta numurs"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Nosaukums"
@@ -1594,8 +1670,8 @@ msgstr "Pieejamās kolonnas"
 msgid "Displayed columns"
 msgstr "Parādītās kolonnas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Meklēšanas rīks"
 
@@ -1623,335 +1699,338 @@ msgstr "Attauvot"
 msgid "Disable"
 msgstr "Atslēgt"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Atvērt _failus ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Atvērt _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Pievienot f_ailus ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Pievienot U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Meklēt _bibliotēkā"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_Par ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "I_estatījumi ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "I_ziet"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "A_tskaņot"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Pauz_e"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Iepriekšējais"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Nākamais"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Atkārtot"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Jaukt"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Sajaukt pēc albu_ma"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Ne_virzīties uz priekšu repertuārā"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Apt_urēt pēc šīs dziesmas"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Dziesmas _info ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Pāriet uz _laiku ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Pāriet uz _dziesmu ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Iestatīt atkārtojuma punktu _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Iestatīt atkārtojuma punktu _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Notīrīt atkārtojuma punktus"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Pēc n_osaukuma"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Pēc _faila ceļa"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Pēc faila _ceļa"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Pēc celiņa _numura"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Pēc _izpildītāja"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Pēc a_lbuma"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Pēc albu_ma izpildītāja"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Pēc izlaišanas _datuma"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Pē_c žanra"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Pēc _ilguma"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Pēc _faila ceļa"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Pēc _pielāgota nosaukuma"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Apgri_eztā kārtībā"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Nejaušā _kārtībā"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Atskaņot/Atsākt"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "A_tsvaidzināt"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Kārtot"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Kārtot izvē_lētos"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Izņemt _dublikātus"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Izņemt _nepieejamos failus"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Jauns"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Pā_rdēvēt ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Izņe_mt"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importēt ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Eksportēt ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Reper_tuāru pārvaldnieks ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Ri_ndas pārvaldnieks ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "_Palielināt skaļumu"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Samazināt skaļumu"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Balansieris ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fekti ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "Ie_rakstīt straumi"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Audio ie_statījumi ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Rādīt _izvēlnes joslu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Rādīt i_nfoapgabalu"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Rādīt infoapgabala viz_ualizāciju"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Rādīt _stāvokļjoslu"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Rādīt a_tlikušo laiku"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Vizualizācijas ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fails"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Atskaņošana"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Repertuārs"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Servisi"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "I_zvade"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "S_kats"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "Ie_rindot/Izņ. no rindas"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Atvērt saturošo mapi"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "A_tsvaidzināt izvēlētos"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Izgriezt"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "I_elīmēt"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Ielīmēt _beigās"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Iezīmēt _visu"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Pā_rdēvēt ..."
 
@@ -1992,33 +2071,32 @@ msgstr "Kursortaustiņi meklē pa:"
 msgid "Scroll on song change"
 msgstr "Ritināt dziesmām mainoties"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK saskarne"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Buferizācija ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2026,25 +2104,25 @@ msgstr[0] "%d kanāls"
 msgstr[1] "%d kanāli"
 msgstr[2] "%d kanālu"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Vieninstances režīms."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Repertuāra režīms."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Aptur pēc pašreizējās dziesmas."
 
@@ -2052,9 +2130,9 @@ msgstr "Aptur pēc pašreizējās dziesmas."
 msgid "Previous track"
 msgstr "Iepriekšējais celiņš"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Atskaņot"
 
@@ -2062,8 +2140,8 @@ msgstr "Atskaņot"
 msgid "Pause/Resume"
 msgstr "Pauze/Atsākt"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stop"
 
@@ -2162,7 +2240,7 @@ msgstr "<b>Taustiņa piesaiste:</b>"
 msgid "_Add"
 msgstr "Pi_evienot"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globālie īsinājumtaustiņi"
 
@@ -2193,25 +2271,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK izvade"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automātiski pieslēgties izvades portiem"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Tika atrasti tikai %d JACK izvades porti, bet vajadzīgi %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Neizdevās pieslēgties JACK portam %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2219,11 +2297,11 @@ msgstr ""
 "JACK atbalsta tikai peldošā punkta audio. Jums Audacious iestatījumos "
 "jāizmaina izvades dziļums uz 'peldošā punkta'."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Neizdevās pieslēgties JACK serverim, vai tas ir palaists?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2328,48 +2406,48 @@ msgstr "Pieslēgties vēlreiz LIRC serverim"
 msgid "Wait before reconnecting:"
 msgstr "Gaidīt, pirms atkārtoti pieslēgties:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki spraudnis"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Dziesmu vārdu teksti nav pieejami"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Kļūda"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Neizdevās saņemt %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Neizdevās parsēt %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Meklē dziesmas vārdu tekstu ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Trūkst dziesmas metadatu"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Pieslēdzas lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Rediģēt dziesmas vārdu tekstu ..."
 
@@ -2381,17 +2459,17 @@ msgstr "M3U repertuāri"
 msgid "Tact Generator"
 msgstr "Takts ģenerators"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takts ģenerators: %d sit./min."
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takts ģenerators: %d sit./min. %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2546,15 +2624,15 @@ msgstr "Šie iestatījumi stāsies spēkā, pārstartējot Audacious."
 msgid "MPG123 Plugin"
 msgstr "MPG123 spraudnis"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Paplašināti</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Lietot precīzo ilguma aprēķināšanu (lēni)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Ieskaušana"
 
@@ -2566,35 +2644,35 @@ msgstr "MPRIS 2 serveris"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS spraudnis"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Kļūda parsējot pārvirzi"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Nezināma HTTP kļūda"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Kļūda parsējot URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Pārāk daudz pārviržu"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Apturēts"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious pašreiz neatskaņo."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Darbvirsmas paziņojumi"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2629,15 +2707,15 @@ msgstr ""
 "GNU Vispārējās Publiskās licences kopijai vajadzētu būt saņemtai kopā ar šo "
 "programmu. Ja tā nav, skatiet <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Rādīt atskaņošanas vadīklas"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Vienmēr rādīt paziņojumu"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Paziņojumā iekļaut albuma nosaukumu"
 
@@ -2645,21 +2723,21 @@ msgstr "Paziņojumā iekļaut albuma nosaukumu"
 msgid "Show"
 msgstr "Rādīt"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pauze"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Nākamais"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 izvade"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 izvade"
 
@@ -2701,23 +2779,23 @@ msgstr ""
 "Autors vēlas pateikties cilvēkiem kanālā #audacious, īpaši Tony Vroon un "
 "John Lindgren, un, protams, iepriekšējā OSS spraudņa autoriem."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Repertuāru pārvaldnieks"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Ieraksti"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Pār_dēvēt"
 
@@ -2729,28 +2807,27 @@ msgstr "PLS repertuāri"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodētājs"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio izvade"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Audacious PulseAudio izvades spraudnis\n"
 "\n"
@@ -2767,11 +2844,11 @@ msgstr ""
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia izvade"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2785,47 +2862,73 @@ msgstr ""
 "Bāzēts uz Audacious SDL izvades spraudņa\n"
 "Autortiesības 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL spektra analizators atskaņotājam Audacious\n"
+"Autortiesības 2013 Christophe Budé, John Lindgren un Carlo Bramini\n"
+"Autortiesības 2014 William Pitcock\n"
+"\n"
+"Balstīts uz XMMS spraudni:\n"
+"Autortiesības 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson "
+"un 4Front Technologies\n"
+"\n"
+"Licence: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Darbojas ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informācija"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Meklēt"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Atvērt mapi ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Pievienot mapi ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Ž_urnāla inspektors ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Atvērt failus"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Pievienot failus"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Atkārtot"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Jaukt"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Atvērt mapi ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Pievienot mapi ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Ž_urnāla inspektors ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt saskarne"
 
@@ -2870,7 +2973,7 @@ msgstr "<b>Pārveidošana</b>"
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Temps:"
 
@@ -2922,58 +3025,46 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Labi. Nosūta atskaņojumu lietotājam: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Pārbauda Last.fm piekļuvi ..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Pieeja liegta"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-"Nospiediet uz sekojošās saites, lai ļautu Audacious nosūtīt jūsu "
-"atskaņojumus:"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Paturiet šo logu atvērtu un vēlreiz noklikšķiniet uz 'Pārbaudīt pieeju'.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Neuztraucieties. Jūsu atskaņojumi ir saglabāti jūsu datorā.\n"
+"Jūsu atskaņojumi pagaidām ir saglabāti jūsu datorā.\n"
 "Tie tiks nosūtīti tiklīdz Audacious tiks dota atļauja."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Tīkla problēma."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Atļauja dota. Nosūta atskaņojumu lietotājam: %s"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Radās problēma, sazinoties ar Last.fm. Lūdzu, vēlāk mēģiniet vēlreiz."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Atļauja liegta. Atveriet sekojošo URL pārlūkā, atļaujiet Audacious piekļuvi "
+"jūsu kontam un tad noklikšķiniet uz \"Pārbaudīt atļauju\" vēlreiz:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Pārbauda..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Radās problēma, sazinoties ar Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Pār_baudīt pieeju"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Pārbaudīt atļauju"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "At_celt pieeju"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Atcelt atļauju"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "Jums jāatļauj Audacious nosūtīt atskaņojumu uz savu Last.fm kontu.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Jums jāatļauj Audacious nosūtīt atskaņojumu uz savu Last.fm kontu."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3004,7 +3095,7 @@ msgstr ""
 "Paldies John Lindgren par palīdzību projekta sākumā.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3012,11 +3103,11 @@ msgstr ""
 "Audacious pašlaik izmanto Last.fm atskaņojumu nosūtītāja uzlabotu versiju.\n"
 "Lūdzu, pārbaudiet atskaņojumu nosūtītāja spraudņa iestatījumus."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL izvade"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3024,13 +3115,13 @@ msgstr ""
 "SDL izvades spraudnis atskaņotājam Audacious\n"
 "Autortiesības 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Bibliotēka"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -3038,7 +3129,7 @@ msgstr[0] "%d rezultātu"
 msgstr[1] "%d rezultāts"
 msgstr[2] "%d rezultāti"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -3046,7 +3137,7 @@ msgstr[0] "(%d paslēpti)"
 msgstr[1] "(%d paslēpts)"
 msgstr[2] "(%d paslēpti)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3054,31 +3145,31 @@ msgstr[0] "%d dziesmu"
 msgstr[1] "%d dziesma"
 msgstr[2] "%d dziesmas"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "šajā žanrā"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "uz"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "izpilda"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "Iz_veidot repertuāru"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Pi_evienot repertuāru"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Meklēt bibliotēkā"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3086,11 +3177,11 @@ msgstr ""
 "Lai importētu jūsu mūzikas bibleotēku atskaņotājā Audacious, izvēlieties "
 "mapi un nospiediet uz ikonas \"atsvaidzināt\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Lūdzu, uzgaidiet ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Izvēlieties mapi"
 
@@ -3186,15 +3277,15 @@ msgstr "Slieksnis:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Atkārtošanas punkti notīrīti."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Atkārtošanas punkts A iestatīts."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Atkārtošanas punkts B iestatīts."
 
@@ -3246,373 +3337,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious balansieris"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Pāriet uz %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Skaļums: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanss: %d%% pa kreisi"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balanss: centrs"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanss: %d%% pa labi"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Iestatījumu izvēlne"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Izslēgt 'Vienmēr virspusē'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Ieslēgt 'Vienmēr virspusē'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Faila info lodziņš"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dubultizmērs"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Vizualizācijas"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Ierakstīšana ieslēgta"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Ierakstīšana izslēgta"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Palielināt skaļumu"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Samazināt skaļumu"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efekti ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Ierakstīt straumi"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Audio iestatījumi ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Atvērt failus ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Atvērt URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Meklēt bibliotēkā"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Atskaņošana"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Repertuārs"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Izvade"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Skatīt"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Servisi"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Par ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "iestatījumi ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Dziesmas info ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Sajaukt pēc albuma"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Nevirzīties uz priekšu repertuārā"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Apturēt pēc pašreizējās dziesmas"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Uzstādīt A-B atkārtošanu"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Notīrīt A-B atkārtošanu"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Pāriet uz dziesmu ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Pāriet uz laiku ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Atskaņot/Atsākt"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Jauns repertuārs"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Pārdēvēt repertuāru ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Izņemt repertuāru"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Iepriekšējais repertuārs"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Nākamais repertuārs"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importēt repertuāru ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Eksportēt repertuāru ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Repertuāru pārvaldnieks ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Rindas pārvaldnieks ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Atsvaidzināt repertuāru"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Rādīt repertuāra redaktoru"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Rādīt balansieri"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Rādīt atlikušo laiku"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Vienmēr virspusē"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Uz visām darbvirsmām"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Saritināt atskaņotāju"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Saritināt repertuāra redaktoru"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Saritināt balansieri"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Pievienot URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Pievienot failus ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Pēc nosaukuma"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Pēc faila nosaukuma"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Pēc faila ceļa"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Izņemt visus"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Notīrīt ierindošanu"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Izņemt nepieejamos failus"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Izņemt dublikātus"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Izņemt neiezīmētos"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Izņemt iezīmētos"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Meklēt un iezīmēt"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Apgriezt iezīmēto"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Notīrīt iezīmējumu"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Iezīmēt visus"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Pēc celiņa numura"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Pēc izpildītāja"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Pēc albuma"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Pēc albuma izpildītāja"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Pēc izlaišanas datuma"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Pēc žanra"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Pēc ilguma"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Pēc pielāgotā nosaukuma"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Sajaukt repertuāru"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Apgriezt repertuāru"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Kārtot iezīmētos"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Kārtot repertuāru"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Atvērt saturošo mapi"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopēt"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Ielīmēt"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Ielīmēt beigās"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Ierindot/Izņemt no rindas"
 
@@ -3625,15 +3724,15 @@ msgstr "Audacious repertuāra redaktors"
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp klasiskā saskarne"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Atvērt mapi ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Pievienot mapi ..."
 
@@ -3721,7 +3820,7 @@ msgid "Slow"
 msgstr "Lēni"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Vidēji"
 
@@ -3856,7 +3955,7 @@ msgstr "Izveidot jaunu repertuāru no atbilstošajiem ierakstiem"
 msgid "Sndfile Plugin"
 msgstr "Sndfile spraudnis"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3895,60 +3994,60 @@ msgstr ""
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio izvade"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Ierīce (noklusētajai atstāt tukšu):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Saglabāt un atjaunot skaļumu:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio kļūda: neatbalstīts audio formāts (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio kļūda: sio_open() neizdevās"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio kļūda: sio_setpar() neizdevās"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio kļūda: sio_start() neizdevās"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Dziesmas maiņa"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Komandas</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Komanda, ko palaist, sākot atskaņot jaunu dziesmu:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Komanda, ko palaist dziesmas beigās:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Komanda, ko palaist repertuāra beigās:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Komanda, ko palaist, kad nomainās dziesmas nosaukums (tīkla plūsmām):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3956,7 +4055,7 @@ msgstr ""
 "Varat izmantot šādus formatēšanas kodus, kuri pirms komandas palaišanas tiks "
 "aizvietoti (ne visi ir derīgi \"end-of-playlist\" komandai):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3982,7 +4081,7 @@ msgstr ""
 "%t: repertuāra pozīcija\n"
 "%T: nosaukums (neformatēts)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3990,15 +4089,15 @@ msgstr ""
 "Parametrus, kuri tiek padoti čaulai, vajadzētu ietvert pēdiņās. Pretējā "
 "gadījumā rodas risks drošībai."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Dziesmas info"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX diskretizācijas frekvences pārveidotājs"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4012,43 +4111,43 @@ msgstr ""
 "Balstīts uz diskretizācijas frekvences pārveidošanas spraudni:\n"
 "autortiesības 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Ātri"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Zema"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Augsta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Ļoti augsta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kvalitāte:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Ātrums un augstums"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Ātrums un augstums</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Ātrums:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Augstums:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Statusa ikona"
 
@@ -4078,11 +4177,11 @@ msgstr "Aizvērt sistēmas ikonu joslu"
 
 #: src/statusicon-qt/statusicon.cc:85
 msgid "_Hide"
-msgstr ""
+msgstr "_Paslēpt"
 
 #: src/statusicon-qt/statusicon.cc:86
 msgid "_Restore"
-msgstr ""
+msgstr "_Atjaunot"
 
 #: src/statusicon-qt/statusicon.cc:95 src/statusicon/statusicon.cc:284
 msgid "Se_ttings ..."
@@ -4152,12 +4251,12 @@ msgstr "<b>Papildu stereo</b>"
 msgid "Tone Generator"
 msgstr "Toņa ģenerators"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Toņa ģenerators: "
 
@@ -4180,7 +4279,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Balss izņemšana"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4256,7 +4355,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX dekodētājs"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4266,19 +4365,31 @@ msgstr ""
 "Balstīts uz in_vtx.dll, autors Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious spraudņa autors Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack dekodētājs"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "zudumradošs (hibrīdais)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "zudumradošs"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4292,14 +4403,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF dekodētājs"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF konfigurācija</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorēt ilgumu no faila"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML kopīgojamie repertuāri (XSPF)"
diff --git a/po/ml_IN.po b/po/ml_IN.po
index e4248e1..330b6f1 100644
--- a/po/ml_IN.po
+++ b/po/ml_IN.po
@@ -9,10 +9,10 @@
 # ST Alfas, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/jlindgren/"
 "audacious/language/ml_IN/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -30,27 +30,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib പ്ലേയര്‍)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "സീക്വന്‍സ്ഡ്"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "അലാം"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -101,149 +101,149 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "ഇത് നിങ്ങളുടെ ഉണര്‍ത്തുപാട്ടാണ്."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "ഇന്നേയ്ക്കുള്ള നിങ്ങളുടെ സ്മാരകം: "
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "സ്മാരകം"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "തിങ്കളാഴ്ച"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "ചൊവ്വാഴ്ച"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
-msgstr "ബുധനാഴ്ച"
+msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
-msgstr "വ്യാഴാഴ്ച"
+msgstr ""
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "വെള്ളിയാഴ്ച"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "ശനിയാഴ്ച"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "ഞായറാഴ്ച"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "സമയം"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "അലാം മുഴങ്ങേണ്ട സമയം (സ്വതവേയുള്ളത്):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "ശേഷം ശാന്തമാകൂ :"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
-msgstr "മണിക്കൂറുകള്‍"
+msgstr ""
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "മിനിറ്റുകള്‍"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "അലാം മുഴങ്ങേണ്ട ദിനങ്ങള്‍ തെരെഞ്ഞെടുക്കുക"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "ദിവസം"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "സ്വതസ്സിദ്ധം"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
-msgstr "ദിവസങ്ങള്‍"
+msgstr ""
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "മായുന്നു"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "സെക്കന്‍ഡുകള്‍"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "ഉച്ചത"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "ഇവിടെ തുടങ്ങുക"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "അവസാനത്തേത്"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "നിലവിലുള്ളത്"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "അധികകല്‍പ്പന"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "സാദ്ധ്യമാക്കുക"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "പ്ലേലിസ്റ്റ് (നിര്‍ബന്ധമില്ല)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "ഒരു പ്ലേലിസ്റ്റ് തിരഞ്ഞെടുക്കുക"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "ഓപ്ഷനുകള്‍"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "ഈ ഓപ്ഷനുകള്‍ എന്താണ് അര്‍ത്ഥമാക്കുന്നത്?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "സഹായം"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "ആല്‍ബം ആര്‍ട്ട്"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr "അല്‍സ ഔട്പുട്ട്"
+msgstr ""
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -278,11 +278,11 @@ msgstr "മിക്സര്‍ ഉപകരണം:"
 msgid "Mixer element:"
 msgstr "മിക്സര്‍ എലമെന്റ്:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-പ്ലഗ്ഗ് (MIDI പ്ലേയര്‍)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -305,68 +305,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -374,86 +374,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-പ്ലഗ്ഗ് - സൗണ്ട് ഫോണ്ട് തെരെഞ്ഞെടുക്കുക"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "ഫയല്‍ നെയിം"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "വലിപ്പം (ബൈറ്റുകള്‍)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "പേര്:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI വിവരങ്ങള്‍ </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "ഫോര്‍മാറ്റ്:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "നീളം (മില്ലി സെക്കന്‍ഡില്‍):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "ട്രാക്കുകളുടെ എണ്ണം:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "ചരം"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI വിവരണങ്ങളും വരികളും </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* ഈ MIDI ഫയലില്‍ നിലവിലുള്ള വിവരണങ്ങള്‍ ഒന്നുമില്ല *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ഈ MIDI ഫയലില്‍ നിലവിലുള്ള വരികള്‍ ഒന്നുമില്ല *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_അടയ്ക്കുക"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(പ്രാബല്യമില്ലാത്ത UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -465,7 +479,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -517,94 +531,94 @@ msgstr "പോസ് ഓഫ്"
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "അവസ്ഥ"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "താരതമ്യേനയുള്ള X ഓഫ്‌സെറ്റ്"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "താരതമ്യേനയുള്ള Y ഓഫ്‌സെറ്റ്"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "പരമാവധി OSD നീളം"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "മള്‍ട്ടി മോണിറ്റര്‍ ക്രമീകരണങ്ങള്‍"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "എല്ലാ മോണിറ്ററുകളും"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "മോണിറ്റര്‍ %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "ഡിസ്പ്ലേ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "ഫെയ്ഡ് ഇന്‍:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "ഫെയ്ഡ് ഔട്ട്"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "ഫോണ്ടുകള്‍"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "ഫോണ്ട് %i"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "നിഴല്‍"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "റെന്‍ഡര്‍ സ്റ്റൈല്‍"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "നിറങ്ങള്‍"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "നിറം %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "കാഞ്ചി സാദ്ധ്യമാക്കുക"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "സംഭവം"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "കമ്പോസിറ്റ് മാനേജര്‍ ശ്രദ്ധയില്‍ പെട്ടു"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -614,60 +628,56 @@ msgstr ""
 "മറ്റൊന്ന് പ്രവര്‍ത്തിക്കുന്നത് നിങ്ങള്‍ക്കറിയാമെങ്കില്‍, ദയവ് ചെയ്ത് ഒരു കമ്പോസിറ്റ് മാനേജര്‍ "
 "പ്രാവര്‍ത്തികമാക്കുക അല്ലെങ്കില്‍ OSD പ്രവര്‍ത്തിച്ചില്ലെന്ന് വരാം"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "വ്യാജമായ സുതാര്യതയ്ക്ക് കമ്പോസിറ്റ് മാനേജര്‍ ആവശ്യമില്ല"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "സുതാര്യത"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "കപടസുതാര്യത"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "യഥാര്‍ത്ഥ സുതാര്യത (X composite Ext. ആവശ്യമുണ്ട്)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "കോമ്പോസിറ്റ് എക്സ്റ്റന്‍ഷന്‍ നിലവില്‍ വന്നിട്ടില്ല"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "കോമ്പോസിറ്റ് എക്സ്റ്റന്‍ഷന്‍ നിലവിലില്ല"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>ഒഡാഷ്യസ് OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "സ്ഥാനം"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "അനിമേഷന്‍"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "എഴുത്ത്"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "അലങ്കാരം"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "കാഞ്ചി"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "പലവക"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -683,11 +693,11 @@ msgstr ""
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>നിറം</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "ബ്ലര്‍ സ്കോപ്പ്"
 
@@ -711,15 +721,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "ആവൃത്തി മുറിയ്ക്കുക:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "സ്പെക്ട്രം അനലൈസര്‍"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "ഓഡിയോ സി.ഡി. പ്ലഗ്ഗിന്‍"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -731,118 +741,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>ഉപകരണം</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "വായനയുടെ വേഗം:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>മെറ്റാഡേറ്റ</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "സി.ഡി.-ടെക്സ്റ്റ് ഉപയോഗിയ്ക്കുക"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB ഉപയോഗിയ്ക്കുക"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP യ്ക്ക് പകരം HTTP ഉപയോഗിക്കാം"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "സെര്‍വര്‍:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "പാത്ത്:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "പോര്‍ട്ട്:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "അസാധുവായ URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "ട്രാക്ക് %d കണ്ടുകിട്ടിയില്ല."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "ട്രാക്ക് %d ഒരു ഡേറ്റാ ട്രാക്ക് ആണ്."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "ഓഡിയോ സി.ഡി. വായിയ്ക്കുന്നതില്‍ പിശക്."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "ഓഡിയോ സി.ഡി."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "സി.ഡി. ഉപകരണം %s തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "ഓഡിയോ ശേഷിയുള്ള സി.ഡി. ഡ്രൈവ് കണ്ടുകിട്ടിയില്ല."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "cddb ബന്ധം സാദ്ധ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "cddb ഇന്‍ഫോ വായിയ്ക്കുന്നതില്‍ പരാജയം: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "ഡ്രൈവ് ശൂന്യമാണ്."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "പിന്തുണയില്ലാത്ത തരം ഡിസ്ക്."
 
@@ -892,7 +902,7 @@ msgstr ""
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
-msgstr "ബേസ്:"
+msgstr ""
 
 #: src/console/plugin.cc:33
 msgid "Treble:"
@@ -995,58 +1005,60 @@ msgstr "തീവ്രത:"
 msgid "Crystalizer"
 msgstr "ക്രിസ്റ്റലൈസര്‍"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "നീക്കം ചെയ്യുക"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1084,11 +1096,11 @@ msgstr "ശബ്ദോച്ചത:"
 msgid "Echo"
 msgstr "പ്രതിധ്വനി"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg പ്ലഗ്ഗിന്‍"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1098,15 +1110,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter പ്ലഗ്ഗിന്‍"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "ഒരു ഫോള്‍ഡര്‍ തിരഞ്ഞെടുക്കുക"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1123,194 +1131,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "ഔട്പുട്ട് ഫയല്‍ ഫോര്‍മാറ്റ്:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "യഥാര്‍ത്ഥഡയറക്റ്ററിയിലേയ്ക്ക സേവ് ചെയ്യുക"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "പൊതുവായവ"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "സ്വയം"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "കൂട്ടിച്ചേര്‍ത്ത സ്റ്റീരിയോ"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "സ്റ്റീരിയോ"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "മോണോ"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "ഓല്‍ഗൊരിതം ഗുണമേന്മ:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "ബിറ്റ്‌റേറ്റ് (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "കംപ്രഷന്‍ നിരക്ക്:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "ഓഡിയോ മോഡ്:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "സംരക്ഷണ പിശക്"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "ഗുണമേന്മ"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR സാദ്ധ്യമാക്കുക"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "തരം:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR ഓപ്ഷനുകള്‍"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "കുറഞ്ഞ ബിറ്റ്‌റേറ്റ് (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "പരമാവധി ബിറ്റ്‌റേറ്റ് (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "ചുരുങ്ങിയ ബൈട്രേറ്റ് കര്‍ശനമായി നിര്‍ബന്ധിക്കുക"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR ക്രമീകരണങ്ങള്‍:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "ശരാശരി ബിറ്റ്റേറ്റ് (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR ഗുണനിലവാരം:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "ചുരുങ്ങിയ ബൈട്രേറ്റ് കര്‍ശനമായി നിര്‍ബന്ധിക്കുക"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "കോപ്പിറൈറ്റടായി അടയാളപ്പെടുത്തുക"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "പ്രഥമമായി അടയാളപ്പെടുത്തുക"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "വെര്‍ഷന്‍ 2 ടാഗിന്റെ സംയോഗം നിര്‍ബന്ധിക്കുക"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "v1 ടാഗ് മാത്രം സംയോഗിക്കുക"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "v2 ടാഗ് മാത്രം സംയോഗിക്കുക"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "ഗുണമേന്മ"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "ടാഗുകള്‍"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "ഗുണനിലവാരം ( 0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "പൊതുവായവ"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC ഡീകോഡര്‍"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "ലോസ്‌ലെസ്സ്"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1318,25 +1410,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO പ്ലഗ്ഗിന്‍"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1348,23 +1440,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL സ്പെക്ട്രം അനലൈസര്‍"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1381,8 +1460,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "എന്‍ട്രി നമ്പര്‍"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "ടൈറ്റില്‍"
@@ -1439,8 +1518,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "തിരച്ചില്‍ ടുള്‍"
 
@@ -1468,335 +1547,338 @@ msgstr "ഡോക്കിങ് ഒഴിവാക്കുക"
 msgid "Disable"
 msgstr "അസാദ്ധ്യമാക്കുക"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "ഫയലുകള്‍ _തുറക്കുക ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "_URL തുറക്കുക"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_ഫയലുകള്‍ ചേര്‍ക്കുക"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL ചേര്‍ക്കുക"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_ഇതേപ്പറ്റി ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_പുറത്തുകടക്കുക"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_പാടുക"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "പോ_സ് ചെയ്യുക"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_നിര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_മുമ്പത്തേത്"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_അടുത്തത്"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_ആവര്‍ത്തിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_കശക്കുക"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_o  പ്ലേലിസ്റ്റ് പുരോഗമനം"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "_ഈ പാട്ട് കഴിഞ്ഞാല്‍ നിര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "സോങ് ഇന്‍ഫോ ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_സമയത്തിലേക്ക് ചാടുക ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "പാട്ടിലേക്ക് _ചാടുക ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "_ടൈറ്റില്‍ അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "ഫയല്‍_പാത്ത് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "ട്രാക്ക് _നമ്പര്‍ അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_ആര്‍ട്ടിസ്റ്റിനനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "ആ_ല്‍ബമനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "റിലീസ് ഡേറ്റ് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "_നീളമനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "ഫയല്‍ പാത്ത് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "സ്വേച്ഛയാലുള്ള തലക്കെട്ട് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "നേ_ര്‍വിപരീത രീതി"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_ക്രമമില്ലാത്ത രീതി"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "പു_തുക്കുക"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_ക്രമത്തിലാക്കുക"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "_പകര്‍പ്പുകള്‍ നീക്കം ചെയ്യുക"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കം ചെയ്യുക"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_പുതിയത്"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "പേര് _മാറ്റുക"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_ഇറക്കുമതി ചെയ്യുക ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_കയറ്റുമതി ചെയ്യുക ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "പ്ലേലിസ്റ്റ് _മാനേജര്‍ ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "ക്യൂ മാനേജര്‍ ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "ശബ്ദം കൂട്ടുക (_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "ശബ്ദം കുറയ്ക്കുക (_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_മെനുബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "_ഇന്‍ഫോബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_സ്റ്റാറ്റസ്ബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "_അവശേഷിക്കുന്ന സമയം കാണിക്കുക"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_ഫയല്‍"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_പ്ലേബാക്ക്"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "പ്ലേ_ലിസ്റ്റ്"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_സേവനങ്ങള്‍"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_ഔട്പുട്ട്"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_കാഴ്ച"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_ക്യൂ/അണ്‍ക്യൂ"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_മുറിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_പകര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_ഒട്ടിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_എല്ലാം തിരഞ്ഞെടുക്കുക"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "പേര് _മാറ്റുക ..."
 
@@ -1837,58 +1919,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK ഇന്‍ഡര്‍ഫേസ്"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - ഒഡാഷ്യസ്"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "ബഫര്‍ ചെയ്യുന്നു ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "ഒഡാഷ്യസ്"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "മോണോ"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "സ്റ്റീരിയോ"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d ചാനല്‍"
 msgstr[1] "%d ചാനലുകള്‍"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "സിംഗ്ള്‍ മോഡ്"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "പ്ലേലിസ്റ്റ് മോഡ്"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "പാട്ടിനു ശേഷം നിര്‍ത്തുന്നു."
 
@@ -1896,9 +1977,9 @@ msgstr "പാട്ടിനു ശേഷം നിര്‍ത്തുന്�
 msgid "Previous track"
 msgstr "മുമ്പത്തെ ട്രാക്ക്"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "പാടുക"
 
@@ -1906,8 +1987,8 @@ msgstr "പാടുക"
 msgid "Pause/Resume"
 msgstr "പോസ്/റെസ്യൂം"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "നിര്‍ത്തുക"
 
@@ -2006,7 +2087,7 @@ msgstr "<b>കീ ബൈന്റിങ്:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2025,35 +2106,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "ജാക്ക് ഔട്പുട്ട്"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2136,48 +2217,48 @@ msgstr "LIRC സെര്‍വറുമായി വീണ്ടും ബന�
 msgid "Wait before reconnecting:"
 msgstr "പുനര്‍ബന്ധത്തിനു മുമ്പ് കാത്തിരിക്കുക:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki പ്ലഗ്ഗിന്‍"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "വരികള്‌ ലഭ്യമല്ല"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "പിശക്"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "വരികള്‍ക്കായി നോക്കുന്നു ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "ചില മെറ്റാഡേറ്റ ലഭ്യമല്ല"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2189,17 +2270,17 @@ msgstr "M3U പ്ലേലിസ്റ്റുകള്‍"
 msgid "Tact Generator"
 msgstr "ടാക്റ്റ് ജനറേറ്റര്‍"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2347,15 +2428,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 പ്ലഗ്ഗിന്‍"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "സറൗണ്ട്"
 
@@ -2367,35 +2448,35 @@ msgstr "MPRIS 2 സെര്‍വര്‍"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "നിര്‍ത്തി"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "ഒഡാഷ്യസ് പ്രവര്‍ത്തിക്കുന്നില്ല."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2415,15 +2496,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "പ്ലേബാക്ക് ക്രമീകരണങ്ങള്‍ കാണിക്കുക"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "എല്ലായ്പ്പോഴും വിജ്ഞാപനങ്ങള്‍ കാണിക്കുക"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2431,21 +2512,21 @@ msgstr ""
 msgid "Show"
 msgstr "കാണിയ്ക്കുക"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "പോസ് ചെയ്യുക"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "അടുത്തത്"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 ഔട്പുട്ട്"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2482,23 +2563,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2510,35 +2591,34 @@ msgstr "PLS പ്ലേലിസ്റ്റുകള്‍"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "പള്‍സ്‌ഓഡിയോ ഔട്പുട്ട്"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2547,47 +2627,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "മുമ്പത്തേത്"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "ആവര്‍ത്തിയ്ക്കുക"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "കശക്കുക"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2629,7 +2726,7 @@ msgstr "<b>കണ്‍വേര്‍ഷന്‍</b>"
 msgid "Method:"
 msgstr "രീതി:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "തോത്:"
 
@@ -2681,52 +2778,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "അനുവാദം ഇല്ല"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "നെറ്റ്‌വര്‍ക്ക് കുഴപ്പം."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "പരിശോധിക്കുന്നു..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2750,84 +2836,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "ഗ്രന്ഥശാല"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "പ്ലേലിസ്റ്റ് _നിര്‍മിക്കുക"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "പ്ലേലിസ്റ്റിലേയ്ക്ക് _ചേര്‍ക്കുക"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "ഗ്രന്ഥശാല തിരയുക"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "ദയവായി കാത്തിരിക്കുക ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "ഫോള്‍ഡര്‍ തെരെഞ്ഞെടുക്കുക"
 
@@ -2921,15 +3007,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2975,379 +3061,387 @@ msgstr "8 kHz"
 
 #: src/skins/equalizer.cc:230 src/skins-qt/equalizer.cc:226
 msgid "16 kHz"
-msgstr "16 kHz"
+msgstr ""
 
 #: src/skins/equalizer.cc:271 src/skins-qt/equalizer.cc:267
 msgid "Audacious Equalizer"
 msgstr "ഒഡാഷ്യസ് ഈക്വലൈസര്‍"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "തിരയുക %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "ശബ്ദം: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "അവശേഷിക്കുന്നത്: %d%% വലത്"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "അവശേഷിക്കുന്നത്: നടുവില്‍"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "അവശേഷിക്കുന്നത്: %d%% ഇടത്"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "ഓപ്ഷന്‍സ് മെനു"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "'എപ്പോഴും മുകളില്‍' അസാദ്ധ്യമാക്കുക"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "'എപ്പോഴും മുകളില്‍' സാദ്ധ്യമാക്കുക"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "ഫയല്‍ ഇന്‍ഫോ ജാലകം"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "പ്ലേബാക്ക്"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "പ്ലേലിസ്റ്റ്"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "കാണുക"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "പുതിയ പ്ലേലിസ്റ്റ്"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "പ്ലേലിസ്റ്റ് എഡിറ്റര്‍ കാണിക്കുക"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "ഈക്വലൈര്‍ പ്രദര്‍ശിപ്പിയ്ക്കുക"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "എപ്പോഴും മുകളില്‍"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "ടൈറ്റിലിനനുസരിച്ച്"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "എല്ലാം നീക്കം ചെയ്യുക"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "വരി വെടിപ്പാക്കുക"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "പകര്‍പ്പുകള്‍ ഒഴിവാക്കുക"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "തിരഞ്ഞെടുക്കാത്തവ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "തിരഞ്ഞെടുത്തവ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "തിരയുക, തിരഞ്ഞെടുക്കുക"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "തിരഞ്ഞെടുപ്പ് ഇന്‍വേര്‍ട്ട് ചെയ്യുക"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "ഒന്നും തിരഞ്ഞെടുക്കേണ്ട"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "എ​ല്ലാം തിരഞ്ഞെടുക്കുക"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "ട്രാക്ക് നമ്പര്‍ അനുസരിച്ച്"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "ആര്‍ട്ടസ്റ്റിനനുസരിച്ച്"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "ആല്‍ബമനുസരിച്ച്"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "ലിസ്റ്റ് ക്രമമില്ലാതെയാക്കുക"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "പട്ടിക തലതിരിയ്ക്കുക"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "തിരഞ്ഞെടുത്തവ ക്രമീകരിയ്ക്കുക"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "പട്ടിക അക്ഷരമാലാക്രമത്തിലാക്കുക"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "മുറിയ്ക്കുക"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "പകര്‍ത്തുക"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "ഒട്ടിയ്ക്കുക"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3360,15 +3454,15 @@ msgstr "ഒഡാഷ്യസ് പ്ലേലിസ്റ്റ് എഡി�
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3456,7 +3550,7 @@ msgid "Slow"
 msgstr "പതുക്കെ"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "പാകം"
 
@@ -3588,7 +3682,7 @@ msgstr "യോജിയ്ക്കുന്ന എന്‍ട്രികള�
 msgid "Sndfile Plugin"
 msgstr "Sndfile പ്ലഗ്ഗിന്‍"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3610,66 +3704,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "പാട്ട് മാറ്റുക"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3684,21 +3778,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX റീസാംപ്ലര്‍"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3707,43 +3801,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "ദ്രുതം"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "താഴ്ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "ഉയര്‍ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "വളരെ ഉയര്‍ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "ഗുണമേന്മ:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "വേഗവും ശ്രുതിയും"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>വേഗവും ശ്രുതിയും</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "വേഗം:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "ശ്രൂതി:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "സ്റ്റാറ്റസ് ഐക്കണ്‍"
 
@@ -3829,12 +3923,12 @@ msgstr "<b>എക്സ്ട്രാ സ്റ്റീരിയോ</b>"
 msgid "Tone Generator"
 msgstr "ടോണ്‍ ജനറേറ്റര്‍"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "ടോണ്‍ ജനറേറ്റര്‍: "
 
@@ -3851,7 +3945,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "വോയ്സ് റിമൂവല്‍"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3900,26 +3994,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX ഡീകോഡര്‍"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack ഡീകോഡര്‍"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "ലോസി (സങ്കരം)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "ലോസി"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3930,14 +4034,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF ഡീകോഡര്‍"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 585a53c..0338cd2 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# abuyop <abuyop@gmail.com>, 2014-2015
+# abuyop <abuyop@gmail.com>, 2014-2016
 # Mick The KN <f.seedsss@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-27 23:11+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-15 08:28+0000\n"
 "Last-Translator: abuyop <abuyop@gmail.com>\n"
 "Language-Team: Malay (http://www.transifex.com/jlindgren/audacious/language/"
 "ms/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Penyahkod AAC (Raw)"
 
@@ -28,20 +28,20 @@ msgstr "Penyahkod AAC (Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Pemain AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "berjujukan"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Penggera"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Tetapkan Penggera ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -52,7 +52,7 @@ msgstr ""
 "\n"
 "Asalnya ditulis oleh Adam Feakin dan Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -150,147 +150,147 @@ msgstr ""
 "    Taip peringatan dalam medan input dan\n"
 "    tanda kotak tanda jika anda mahu ia dipaparkan."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ini adalah panggilan bangun tidur anda."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Peringatan untuk hari ini ialah..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Peringatan"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Isnin"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Khamis"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Jumaat"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Ahad"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Masa"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Penggera pada (lalai):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Tenang selepas:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "jam"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minit"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Pilih hari bagi penggera beraktif"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Hari"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Lalai"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Hari"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Pudar"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "Saat"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volum"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Bermula pada"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Terakhir"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Semasa"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Perintah Tambahan"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "Aktif"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Senarai Main (pilihan)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Pilih satu senarai main"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Pilihan"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Apa pilihan ini bermakna?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Seni Album"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Output ALSA"
 
@@ -332,11 +332,11 @@ msgstr "Peranti campuran:"
 msgid "Mixer element:"
 msgstr "Elemen campuran:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Pemain MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -378,68 +378,68 @@ msgstr ""
 "Tony Vroon\n"
 "atas bantuan pengujian alfa yang diberi"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Batalkan gandaan lalai:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Batalkan polifoni lalai:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Batalkan reverb lalai:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Hidup"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Batalkan korus lalai:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Main Balik</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transsposisi:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "seminada"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Anjak dram:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "nombor nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Langkau senyap hadapan"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Langkau senyap belakang"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Pensintesis</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Kadar sampel:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -447,86 +447,106 @@ msgstr "Kadar sampel:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pilih fail SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Buka"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nama fail"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Saiz (bait)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Maklumat MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Panjang (msaat):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Nombor Trek:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "pembolehubah"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Masa Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Ulasan dan Lirik MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* tiada ulasan tersedi dalam fail MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* tiada lirik didapati dalam fail MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "T_utup"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(UTF-8 tidak sah)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Pelayar Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Pelayar Ampache\n"
+"\n"
+"Klien Ampache untuk Audacious.\n"
+"\n"
+"Lesen: GNU GPLv3\n"
+"Hakcipta (C) Róbert Čerňanský dan John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -545,7 +565,7 @@ msgstr ""
 "Berdasarkan bahagian dalam  pustaka Ghosd Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Paparan Atas-Skrin)"
 
@@ -597,94 +617,94 @@ msgstr "Matikan Jeda"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Mencetus OSD apabila main tidak dijeda"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Penempatan"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X relatif diimbangi:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y relatif diimbangi:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Max lebar OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "pilihan Pelbagai-Monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Paparkan OSD digunakan:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "semua monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Masa (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Paparan:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Pudar dalam:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Pudar luar:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Font"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Bayang"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Realisasi Gaya"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Warna"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Warna %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Aktifkan pencetus"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Acara"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Pengurus komposit dikesan"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -694,60 +714,56 @@ msgstr ""
 "melainkan anda tahu bahawa anda mempunyai satu berjalan, sila mengaktifkan "
 "pengurus komposit sebaliknya OSD tidak akan berfungsi dengan betul"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Komposit pengurus tidak diperlukan untuk ketelusan palsu"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Ketelusan"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Ketelusan palsu"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Ketelusan sebenar (minta X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Lanjutan komposit tidak dimuatkan"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Sambungan komposit tidak tersedia"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Kedudukan"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animasi"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Teks"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Hiasan"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Pemicu"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Pelbagai"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Uji"
 
@@ -763,11 +779,11 @@ msgstr "Senarai Main ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Senarai Main Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Warna</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Skop Kabur"
 
@@ -791,15 +807,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frekuensi kerat:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Penganalisis Spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Pemalam CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -819,118 +835,118 @@ msgstr ""
 "\n"
 "Ini merupakan projek Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Peranti</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Kelajuan baca:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Batalkan peranti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Data meta</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Guna Teks-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Guna CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Guna HTTP selain dari CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Pelayan:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Laluan:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Gagal mengawalkan subsistem cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s tidak sah."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Trek %d tidak ditemui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Trek %d adalah trek data."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Ralat membaca CD audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Gagal membuka peranti CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Tiada pemacu CD upaya audio ditemui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Gagal menyelesaikan pengawalan pemacu CD dibuka."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Gagal mendapatkan nombor trek pertama/terakhir."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Tidak dapat baca/tamatkan LSN untuk trek %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Gagal mencipta sambungan cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Gagal menanya pelayan CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Gagal menanya pelayan CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Gagal membaca maklumat cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Pemacu kosong."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Jenis cakera tidak disokong."
 
@@ -1100,58 +1116,60 @@ msgstr "Keamatan:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Pemalam Lembaran Isyarat"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Padam Fail"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Ralat mengalih %s ke tong sampah: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Ralat memadam %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Ralat memadam %s: bukan fail setempat."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Anda mahu alih fail terpilih ke tong sampah?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Alih ke Tong Sampah"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Anda mahu padam fail terpilih secara kekal?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Padam"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Padam Fail Terpilih"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Kaedah Padam</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Alih ke tong sampah selain dari memadam serta-merta"
 
@@ -1193,11 +1211,11 @@ msgstr "Volum:"
 msgid "Echo"
 msgstr "Gema"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Pemalam FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1213,15 +1231,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Pemalam FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Ambil satu folder"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1251,194 +1265,278 @@ msgstr ""
 "ini; jika tidak disertakan, tulis ke Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Format fail output:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Simpan ke dalam direktori asal"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Simpan ke dalam direktori suai:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Jana nama fail dari:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nama fail asal"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nama fail asal (tanpa akhiran)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Tag fail asal"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Tambah nombor trek ke nama fail"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Am"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Stereo Gabung"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Kualiti Algoritma:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Kadar Sampel Output:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Kadar Bit / Nisbah Pemampatan:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Kualiti algoritma:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Kadar bit (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Kadar bit:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Nisbah pemampatan:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Mod Audio:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Mod audio:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Pelbagai:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Paksa turutan ISO ketat"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Pelindungan ralat"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kualiti"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Benarkan VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Jenis:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Pilihan VBR:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Kadar bit minimum:"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Kadar bit minimum (kbps):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Kadar bit maksimum:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Kadar bit maksimum (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Kadar bit purata:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Paksa kadar bit minimum betul-betul"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Pilihan ABR:"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Kadar bit purata (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Aras kualiti VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Paksa kadar bit minimum betul-betul"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Buang pengepala VBR Xing"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parameter Bingkai:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Pengepala Bingkai</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Tanda sebagai hakcipta"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Tanda sebagai asal"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parameter ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Tag ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Paksa penambahan tag versi 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Hanya tambah tag v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Hanya tambah tag v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kualiti"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tag"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Aras kualiti (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Kualiti (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Am"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Penyahkod FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "tak hilang"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1450,7 +1548,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1458,19 +1556,19 @@ msgstr ""
 "Pemalam GIO untuk Audacious\n"
 "Hakcipta 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Pemalam GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Mod baca-dan-tambah tidak disokong"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Mod buka tidak sah"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1490,32 +1588,10 @@ msgstr ""
 "\n"
 "Lesen: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Penganalisis Spektrum OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Penganalisis Spektrum OpenGL untuk Audacious\n"
-"Hakcipta 2013 Christophe Budé, John Lindgren, dan Carlo Bramini\n"
-"Hakcipta 2014 William Pitcock\n"
-"\n"
-"Berdasarkan pada pemalam XMMS:\n"
-"Hakcipta 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, dan "
-"4Front Technologies\n"
-"\n"
-"Lesen: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Pintasan GNOME"
@@ -1536,8 +1612,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Nombor masukan"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Tajuk"
@@ -1594,8 +1670,8 @@ msgstr "Lajur tersedia"
 msgid "Displayed columns"
 msgstr "Lajur dipapar"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Alat Gelintar"
 
@@ -1623,335 +1699,338 @@ msgstr "Tanggalkan"
 msgid "Disable"
 msgstr "Lumpuhkan"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Buka Fail ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Buka _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "T_ambah Fail ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Tambah U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Gelintar _Pustaka"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "Per_ihal ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "T_etapan ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Main"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Jeda"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Henti"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Ter_dahulu"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Ber_ikutnya"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Ulang"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "K_ocok"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Kocok mengikut Albu_,"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "T_iada Senarai Main Pendahuluan"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Henti Se_lepas Lagu Ini"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Mak_lumat Lagu ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Lompat ke Ma_sa ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "L_ompat ke Lagu ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Tetapkan Titik Ulang _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Tetapkan Titik Ulang _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Kosongkan Titik Ulang"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Mengikut _Tajuk"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Mengikut Nama _Fail"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Mengikut _Laluan Fail"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Mengikut _Nombor Trek"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Mengikut _Artis"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Mengikut Al_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Mengikut Albu_m Artis"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Mengikut Tarik_h Keluaran"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Mengikut _Genre"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Mengikut Pan_jang"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Mengikut Laluan _Fail"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Mengikut Tajuk _Suai"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Tertib S_ongsang"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Tertib _Rawak"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Main/Sambung Semula"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "Se_gar Semula"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Isih"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Isih T_erpilih"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Buang Pen_dua"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Buang Fail Yang _Tiada"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Baharu"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "N_ama Semula ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "B_uang"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Import ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Eksport ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Pen_gurus Senarai Main ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Pengurus Baris _Gilir ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Volum _Naik"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Volum _Turun"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "Pen_yama..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "K_esan ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Rakam Strim"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "T_etapan Audio ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Tunjuk Palang _Menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Tunjuk Palang Ma_klumat"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Tunjuk Peng_visualan Palang Maklumat"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Tunjuk Palang _Status"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Tunjuk Masa _Berbaki"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "Pe_ngvisualan ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Main Balik"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Se_narai Main"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "Perk_hidmatan"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Output"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Lihat"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Baris Gilir/Nyahbaris Gilir"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Buka Folder Dikandungi"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Segar Semula Dipilih"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Po_tong"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "Sa_lin"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "Tam_pal"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Tampal di _Penghujung"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Pilih Semu_a"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Nama Semula ..."
 
@@ -1992,57 +2071,56 @@ msgstr "Kekunci anak panah jangkau:"
 msgid "Scroll on song change"
 msgstr "Tatal bila lagu berubah"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Antaramuka GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Menimbal ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d saluran"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Mod tunggal."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Mod senarai main."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Dihentikan selepas lagu."
 
@@ -2050,9 +2128,9 @@ msgstr "Dihentikan selepas lagu."
 msgid "Previous track"
 msgstr "Trek terdahulu"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Main"
 
@@ -2060,8 +2138,8 @@ msgstr "Main"
 msgid "Pause/Resume"
 msgstr "Jeda/Sambung Semula"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Henti"
 
@@ -2160,7 +2238,7 @@ msgstr "<b>Pengikatan Kekunci:</b>"
 msgid "_Add"
 msgstr "T_ambah"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Kekunci Panas Sejagat"
 
@@ -2190,25 +2268,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Output JEK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Sambung ke port output secara automatik"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Hanya %d port output JACK ditemui tetapi %d yang diperlukan."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Gagal menyambung ke port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2216,11 +2294,11 @@ msgstr ""
 "JACK hanya menyokong audio titik-apung. Anda mesti ubah kedalaman bit output "
 "ke titik-apung di dalam tetapan Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Gagal bersambung dengan pelayan JACK; adakah ia berjalan?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2325,48 +2403,48 @@ msgstr "Sambung semula ke pelayan LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Tunggu sebelum disambung semula:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Pemalam LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Tiada lirik tersedia"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Ralat"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Tidak boleh dapatkan %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Tidak boleh hurai %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Mencari lirik ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Data meta lagu hilang"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Menyambung ke lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Sunting lirik ..."
 
@@ -2378,17 +2456,17 @@ msgstr "Senarai Main M3U"
 msgid "Tact Generator"
 msgstr "Penjana Rentak"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Penjana rentak: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Penjana rentak: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2543,15 +2621,15 @@ msgstr "Tetapan ini akan berkesan bila Audacious dimulakan semula."
 msgid "MPG123 Plugin"
 msgstr "Pemalam MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Lanjutan</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Guna pengiraan lebih tepat (perlahan)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Keliling"
 
@@ -2563,35 +2641,35 @@ msgstr "Pelayan MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Pemalam Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Ralat menghurai arah semula"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ralat HTTP tidak diketahui"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Ralat menghurai URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Terlalu banyak arah semula"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Dihentikan"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacioud tidak dimainkan."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Pemberitahuan Desktop"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2627,15 +2705,15 @@ msgstr ""
 "Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama dengan "
 "pengurus skrip Nautilus; jika tidak, rujuk <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Tunjuk kawalan main balik"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Sentiasa tunjuk pemberitahuan"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Sertakan nama album dalam pemberitahuan"
 
@@ -2643,21 +2721,21 @@ msgstr "Sertakan nama album dalam pemberitahuan"
 msgid "Show"
 msgstr "Tunjuk"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Jeda"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Output OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Output OSS3"
 
@@ -2699,23 +2777,23 @@ msgstr ""
 "Terima kasih buat individu di #audacious, terutamanya Tony Vroon dan John "
 "Lindgren serta bekas pengarang pemalam OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Pengurus Senarai Main"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Masukan"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Buang"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "N_ama Semula"
 
@@ -2727,51 +2805,48 @@ msgstr "Senarai Main PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Penyahkod OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Output PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Pemalam Output Audacious PulseAudio\n"
 "\n"
-"Program ini adalah perisian bebas; anda boleh mengedarkannya dan/atau\n"
-"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang\n"
-"diterbitkan oleh Free Software Foundation; sama ada versi 2 dari lesen, \n"
-"atau (mengikut pilihan anda) mana-mana versi terkini\n"
+"Program ini adalah perisian bebas; anda boleh mengedarkannya dan/atau "
+"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang diterbitkan oleh "
+"Free Software Foundation; sama ada versi 2 dari lesen, atau (mengikut "
+"pilihan anda) mana-mana versi terkini\n"
 "\n"
-"Program ini diedarkan dengan harapan ianya akan berguna, TANPA \n"
-"SEBARANG JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN,\n"
-"JAMINAN KUALITI, atau JAMINAN ATAS APA JUA SEBAB. Sila lihat GNU\n"
-"General Public License untuk maklumat lanjut.\n"
+"Program ini diedarkan dengan harapan ianya akan berguna, TANPA SEBARANG "
+"JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN atau JAMINAN ATAS APA JUA "
+"SEBAB. Sila lihat GNU General Public License untuk maklumat lanjut.\n"
 "\n"
-"Anda seharusnya menerima satu salinan Lesen Awam Am GNU \n"
-"bersama-sama dengan Gwibber; jika tidak, laporkannya ke Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama program "
+"ini; jika tidak, laporkannya ke Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Output QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2785,47 +2860,73 @@ msgstr ""
 "Berdasarkan pada Pemalam Output SDL untuk Audacious\n"
 "Hakcipta 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Penganalisis Spektrum OpenGL untuk Audacious\n"
+"Hakcipta 2013 Christophe Budé, John Lindgren, dan Carlo Bramini\n"
+"Hakcipta 2014 William Pitcock\n"
+"\n"
+"Berdasarkan pada pemalam XMMS:\n"
+"Hakcipta 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, dan "
+"4Front Technologies\n"
+"\n"
+"Lesen: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Berfungsi ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Maklumat"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Gelintar"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Buka Folder ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Tambah Folder ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Pemeriksa _Log ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Buka Fail"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Tambah Fail"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Terdahulu"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Ulang"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Kocok"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Buka Folder ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Tambah Folder ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Pemeriksa _Log ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Antaramuka Qt"
 
@@ -2869,7 +2970,7 @@ msgstr "<b>Penukaran</b>"
 msgid "Method:"
 msgstr "Kaedah:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Kadar:"
 
@@ -2921,55 +3022,46 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobble untuk pengguna: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Keizinan Dinafikan"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Capai pautan berikut untuk membolehkan Audacious scrobble lagu anda:"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Memeriksa capaian Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Kekalkan tetingkap ini dibuka dan klik 'Semak Keizinan' lagi.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Jangan risau. Scrobble anda disimpan dalam komputer anda.\n"
-"Ia akan diserah sebaik sahaja Audacious dibenarkan membuatnya."
+"Scrobble anda disimpan dalam komputer anda buat sementara. Ia akan diserah "
+"sebaik sahaja Audacious dibenarkan mencapainya."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Masalah Rangkaian."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Keizinan diberi.  Scrobble untuk pengguna %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Terdapat masalah menghubungi Last.fm. Sila cuba lagi kemudian."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Keizinan dinafikan. Buka URL berikut di dalam pelayar, yang mana Audacious "
+"dapat mencapai akaun anda, kemudian klik 'Semak Keizinan' sekali lagi: "
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Memeriksa..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Terdapat masalah menghubungi Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "S_emak Keizinan"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Periksa Keizinan"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Batalkan Keizinan"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Batalkan Keizinan"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "Anda perlu benarkan Audacious scrobble trek ke akaun Last.fm anda.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Anda perlu benarkan Audacious scrobble trek ke akaun Last.fm anda."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3000,7 +3092,7 @@ msgstr ""
 "Terima kasih buat John Lindgren kerana membantu saya memulakan projek ini.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3008,11 +3100,11 @@ msgstr ""
 "Audacious kini menggunakan versi dipertingkat Scrobbler Last.fm.\n"
 "Sila semak Keutamaan untuk pemalam Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Output SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3020,55 +3112,55 @@ msgstr ""
 "Pemalam Output SDL untuk Audacious\n"
 "Hakcipta 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Pustaka"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d keputusan"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d tersembunyi)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d lagu"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "dari genre ini"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "hidup"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "oleh"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Cipta Senarai Main"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "T_ambah ke Senarai Main"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Gelintar pustaka"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3076,11 +3168,11 @@ msgstr ""
 "Untuk mengimport pustaka muzik anda ke dalam Audacious, pilih satu folder "
 "dan kemudian klik pada ikon \"segar semula\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Tunggu sebentar ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Pilih Folder"
 
@@ -3176,15 +3268,15 @@ msgstr "Ambang:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Ulang titik dikosongkan."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Ulang titik A ditetapkan."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Ulang titik B ditetapkan"
 
@@ -3236,373 +3328,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Penyama Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Jangkau ke %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volum: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Imbangan: %d%% kiri"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Imbangan: tengah"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Imbangan: %d%% kanan"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu Pilihan"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Lumpuhkan 'Sentiasa Di Atas'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Benarkan 'Sentiasa Di Atas'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Kotak Maklumat Fail"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Saiz Dua Kali Ganda"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Pengvisualan"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Rakaman hidup"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Rakaman mati"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Volum Naik"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Volum Turun"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Kesan ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Rakam Strim"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Tetapan Audio ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Buka Fail ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Buka URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Gelintar Pustaka"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Main Balik"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Senarai Main"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Output"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Lihat"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Perkhidmatan"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Perihal ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Tetapan ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Maklumat Lagu ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Kocok mengikut Album"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Tiada Senarai Main Pendahuluan"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Henti Selepas Lagu Ini"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Tetapkan Ulang A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Kosongkan Ulang A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Lompat ke Lagu ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Lompat ke Masa ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Main/Sambung Semula"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Senarai Main Baharu"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Nama Semula Senarai Main ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Buang Senarai Main"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Senarai Main Terdahulu"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Senarai Main Berikutnya"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Import Senarai Main ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Eksport Senarai Main ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Pengurus Senarai Main ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Pengurus Baris Gilir ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Segar Semula Senarai Main"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Tunjuk Penyunting Senarai Main"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Tunjuk Penyama"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Tunjuk Masa Berbaki"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sentiasa di Atas"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Pada Semua Ruang Kerja"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Gulung Pemain"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Gulung Penyunting Senarai Main"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Gulung Penyama"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Tambah URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Tambah Fail ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Mengikut Tajuk"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Mengikut Nama Fail"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Mengikut Laluan Fail"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Buang Semua"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Kosongkan Baris Gilir"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Buang Fail Tidak Tersedia"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Buang Pendua"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Buang Dinyahpilih"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Buang Terpilih"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Gelintar dan Pilih"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Songsangkan Pemilihan"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Pilih Tiada"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Mengikut Nombor Trek"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Mengikut Artis"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Mengikut Album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Mengikut Album Artis"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Mengikut Tarikh Keluaran"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Mengikut Genre"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Mengikut Panjang"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Mengikut Tajuk Suai"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Rawakkan Senarai"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Songsangkan Senarai"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Isih Terpilih"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Isih Senarai"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Buka Folder Dikandungi"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Potong"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Salin"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Tampal"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Tampal di Penghujung"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Baris Gilir/Nyahbaris Gilir"
 
@@ -3615,15 +3715,15 @@ msgstr "Penyunting Senarai Main Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d dar %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Antaramuka Klasik Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Buka Folder ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Tambah Folder ..."
 
@@ -3711,7 +3811,7 @@ msgid "Slow"
 msgstr "Lambat"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Sederhana"
 
@@ -3847,7 +3947,7 @@ msgstr "Cipta senarai main baharu dengan masukan sepadan"
 msgid "Sndfile Plugin"
 msgstr "Pemalam Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3887,60 +3987,60 @@ msgstr ""
 "program; jika tidak, laporkannya ke Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Output Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Peranti (kosong untuk lalai):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Simpan dan pulihkan volum:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Ralat Sndio: Format audio tidak disokong (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Ralat Sndio: sio_open() gagal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Ralat Sndio: sio_setpar() gagal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Ralat Sndio: sio_start() gagal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Lagu Berubah"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Perintah</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Perintah dijalankan bila memulakan lagu baharu:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Perintah dijalankan dipenghujung lagu:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Perintah dijalankan dipenghujung senarai main:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Perintah dijalankan bila tajuk lagu berubah (untuk strim rangkaian):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3949,7 +4049,7 @@ msgstr ""
 "menjalankan perintah (bukan semua berguna untuk perintah penghujung-senarai-"
 "main):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3975,7 +4075,7 @@ msgstr ""
 "%t: Kedudukan senarai main\n"
 "%T: Tajuk (tanpa format)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3983,15 +4083,15 @@ msgstr ""
 "Parameter dilepasi ke shell seharusnya dikurungkan dalam petikan. Jika "
 "dibuat sebaliknya mengundang hasil yang tidak dijangka."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Maklumat Lagu"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Pensampel Semula SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4007,43 +4107,43 @@ msgstr ""
 "Kadar Sampel:\n"
 "Hakcipta 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Pantas"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Rendah"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Sangat Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kualiti:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Kelajuan dan Pic"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Kelajuan dan Pic</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Kelajuan:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Pic:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikon Status"
 
@@ -4147,12 +4247,12 @@ msgstr "<b>Stereo Ekstra</b>"
 msgid "Tone Generator"
 msgstr "Penjana Nada"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Penjana Nada:"
 
@@ -4174,7 +4274,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Pembuangan Suara"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4251,7 +4351,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Penyahkod VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4261,19 +4361,31 @@ msgstr ""
 "Berdasarkan pada in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Pemalam Audacious oleh Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Pemalam Win32 waveOut untuk Audacious\n"
+"Hakcipta 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Penyahkod WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "hilang (hidbrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "hilang"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4287,14 +4399,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Penyahkod 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Konfigurasi XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Abai panjang dari fail"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Senarai Main Boleh Kongsi XML (XSPF)"
diff --git a/po/nl.po b/po/nl.po
index bead893..9e84a61 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,10 +11,10 @@
 # shured <shured1@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Dutch (http://www.transifex.com/jlindgren/audacious/language/"
 "nl/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) Decoder"
 
@@ -32,20 +32,20 @@ msgstr "AAC (Raw) Decoder"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Player)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "gesequentieerd"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Alarm instellen ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Origineel geschreven door Adam Feakin en Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -107,147 +107,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Dit is uw opstaan melding"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Uw herinnering voor vandaag is..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Maandag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Zondag"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tijd"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarm (op standaard)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Stil na:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "uren"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuten"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Kies de dag voor het alarm om aan te gaan"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dag"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Standaard"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dagen"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Vervagen"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "Seconden"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Start bij"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Laatste"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Huidige"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Extra Opdracht"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "Aan"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Afspeellijst (Hoeft niet)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Selecteer een afspeellijst"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opties"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Wat betekenen deze opties"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Help"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albumhoes"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA Uitvoer"
 
@@ -290,11 +290,11 @@ msgstr "Mixer apparaat:"
 msgid "Mixer element:"
 msgstr "Mixer element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Speler)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -317,68 +317,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Aan"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Afspelen</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "Noteer nummers"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Sample rate:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -386,86 +386,100 @@ msgstr "Sample rate:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont bestand selecteren"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Sluiten"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Open"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Groote (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info <span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "A"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Lengte (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Aantal Tracks:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Commentaar en songtekst </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* geen commentaar beschikbaar in dit MIDI bestand *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* geen songtekst beschikbaar in dit MIDI bestand *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Sluit"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (onjuist UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -477,7 +491,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -531,154 +545,150 @@ msgstr "Pause Uit"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD wordt geactiveerd wanneer afspelen wordt hervat."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Plaatsing"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relatieve X verplaatsing:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relatieve Y verplaatsing:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Max OSD breedte:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Multi-Monitor opties"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Toon OSD op:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "alle monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Weergeven:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Fade in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Fade uit:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Lettertype %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Schaduw"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Weergavestijl"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Kleur %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Trekker inschakelen"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Doorzichtigheid"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Valse doorzichtigheid"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte doorzichtigheid (vereist X Composiet uitbreiding)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Positie"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animatie"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoratie"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Trekker"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Divers"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -694,11 +704,11 @@ msgstr "ASXv1/ASXv2 Afspeellijsten"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Afspeellijsten (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Kleur</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -722,15 +732,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Knip frequentie:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spectrum Analyseerder"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -742,118 +752,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Apparaat</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Lees snelheid:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Override apparaat:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Gebruik CD-Tekst"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Gebruik CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Gebruik HTTP in plaats van CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Pad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Fout bij initialiseren cdio subsysteem."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ongeldige URI %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Track %d niet gevonden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Track %d is alleen data."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Fout bij lezen audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Het openen van CD apparaat %s is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Geen CD speler met audio mogelijkheid gevonden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Het  Initialiseren van de geopende CD Drive is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Het herstellen van de eerste/laatste tracknummer is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Fout bij verbinden met de cddb"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Fout bij lezen van cddb info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Schijfstation is leeg."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Niet-ondersteund schijftype."
 
@@ -1006,58 +1016,60 @@ msgstr "Intensiteit:"
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Verwijder Bestanden"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Fout bij verplaatsen %s naar de prullenbak: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Fout bij verwijderen %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Fout bij verwijderen %s: is geen lokaal bestand."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Wilt u de geselecteerde bestanden verplaatsen naar de prullenbak?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Verplaats naar Prullenbak"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Wilt u de geselecteerde bestanden definitief verwijderen?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Verwijder"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Verwijder Geselcteerde Bestanden"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Verwijder Methode</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Verplaats naar de prullenbak ipv onmiddellijk verwijderen"
 
@@ -1095,11 +1107,11 @@ msgstr "Volume:"
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1109,15 +1121,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter Plugin"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Kies een map"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1134,194 +1142,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Uitvoer bestandsformaat:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Opslaan in oorspronkelijke map"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Oorspronkelijke bestandsnaam"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Oorspronkelijke bestandslabel"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Algemeen"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Samengevoegd stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritme kwaliteit:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Sample Rate Uitvoer:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Compressie Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Compressie ratio:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Audio Modus:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Diversen:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Foutbescherming"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kwaliteit"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR inschakelen"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR Opties:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimale bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximale bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR Opties:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Gemiddelde bitrate (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR kwaliteitsniveau:"
 
-#: src/filewriter/mp3.cc:920
-msgid "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:526
+msgid "Omit Xing VBR header"
+msgstr ""
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Markeer als auteursrecht"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Markeer als origineel"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forceer het toevoegen van een versie 2 tag"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Alleen v1 tag toevoegen"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Alleen v2 tag toevoegen"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kwaliteitsniveau (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Algemeen"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC Decoder"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1333,7 +1425,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1341,19 +1433,19 @@ msgstr ""
 "GIO Plugin voor Audicious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1365,23 +1457,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spectrum Analyseerder"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME Snelkoppeling"
@@ -1398,8 +1477,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Invoer nummer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titel"
@@ -1456,8 +1535,8 @@ msgstr "Beschikbare kolommen"
 msgid "Displayed columns"
 msgstr "Weergegeven kolommen"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Zoek hulpmiddel"
 
@@ -1485,335 +1564,338 @@ msgstr "Loskoppelen"
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Open bestanden ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Open _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Bestanden Toevoegen ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL toevoegen ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Doorzoek_Bibliotheek"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "In_stellingen ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Vo_rige"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Volgende"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Herhaal"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Lied_Informatie ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Spring naar _Tijd ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Volgens _Titel"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Volgens _Nummer"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Volgens _Artiest"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Volgens uitgave_datum"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Volgens _Bestandspad"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Volgens _Aangepaste titel"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "R_angschikking omkeren"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Willekeurige volgorde"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Vernieuw"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nieuw"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Verwijder"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importeer ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exporteer ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Volume _Hoger"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Volume _Lager"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_ffecten ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Toon _Menubalk"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Show I_nfobalk"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Toon _Statusbalk"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Spee_llijst"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Uitvoer"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Bekijk"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "In/uit _wachtrij"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopieer"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Plak"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Selecteer _Alles"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "He_rnoem ..."
 
@@ -1854,58 +1936,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanaal"
 msgstr[1] "%d kanalen"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Speellijst modus."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr ""
 
@@ -1913,9 +1994,9 @@ msgstr ""
 msgid "Previous track"
 msgstr "Vorig liedje"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Afspelen"
 
@@ -1923,8 +2004,8 @@ msgstr "Afspelen"
 msgid "Pause/Resume"
 msgstr "Pauzeer/Hervat"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stop"
 
@@ -2018,7 +2099,7 @@ msgstr ""
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globale Sneltoetsen"
 
@@ -2037,35 +2118,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK Uitvoer"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2150,48 +2231,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki Plugin"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Geen song-tekst beschikbaar"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Fout"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Zoeken naar teksten ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Ontbrekende metadata"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Verbinden met lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2203,17 +2284,17 @@ msgstr "M3U Afspeellijsten"
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2361,15 +2442,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Geadvanceerd</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2381,35 +2462,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Onbekende HTTP fout"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Teveel redirects"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious is niets aan het afspelen."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Desktop Notificaties"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2429,15 +2510,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Laat altijd de notificaties zien"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2445,21 +2526,21 @@ msgstr ""
 msgid "Show"
 msgstr "Laat zien"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pauze"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Volgende"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 Uitvoer"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 Uitvoer"
 
@@ -2501,23 +2582,23 @@ msgstr ""
 "Ik wil graag de mensen op #audacious bedanken. Speciaal Tony Vroon en John "
 "Lindgren en natuurlijk de auteurs van de vorige OSS plugin."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Invoer"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2529,35 +2610,34 @@ msgstr "PLS Afspeellijsten"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Decoder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio Uitvoer"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Uitvoer"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2566,47 +2646,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Werken ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Map Openen ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Map Toevoegen ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Bestanden Openen"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Bestanden Toevoegen"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Herhaal"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Shuffle"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Map Openen ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Map Toevoegen ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt Interface"
 
@@ -2648,7 +2745,7 @@ msgstr "<b>Conversie</b>"
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Rate:"
 
@@ -2700,53 +2797,41 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling voor gebruiker: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Toegang Geweigerd"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netwerk Probleem."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"Er is een probleem om met Last.fm te verbinden. Probeer het later nog eens."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Controleren..."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2770,17 +2855,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL Uitvoer"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2788,68 +2873,68 @@ msgstr ""
 "SDL Output Plugin voor Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Bibliotheek"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultaat"
 msgstr[1] "%d resultaten"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d verborgen)"
 msgstr[1] "(%d verborgen)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d lied"
 msgstr[1] "%d liedjes"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "van deze genre"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "op"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "volgens"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Creëer Afspeellijst"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "Voeg toe _Aan Afspeellijst"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Zoek bibliotheek"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Aub wachten ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Kies Map"
 
@@ -2943,15 +3028,15 @@ msgstr ""
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Herhaal ingesteld punt A."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Herhaal ingesteld punt B."
 
@@ -3003,373 +3088,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balans: %d%% links"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balans: gecentreerd"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balans: %d%% rechts"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Opties menu"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "'Altijd bovenaan' uitschakelen"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "'Altijd bovenaan' inschakelen"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Bestandsinformatie Box"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Dubbele Grootte"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualisatie "
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Open Bestanden ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Open URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Doorzoek Bibliotheek"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr ""
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Speellijst"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr ""
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Over ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Instellingen ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Stop Na Dit Liedje"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Set A-B Herhaling"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Wis A-B Herhaling"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Spring naar Liedje ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Spring naar Tijd ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nieuwe afspeellijst"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Hernoem Afspeellijst ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Verwijder Afspeellijst"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Vorige Afspeellijst"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Volgende Afspeellijst"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importeer Afspeellijst ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exporteer Afspeellijst ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Toon Equalizer"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Altijd bovenaan"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "URL Toevoegen ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Bestanden Toevoegen ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Volgens titel"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Volgens Bestandsnaam"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Volgens Bestandspad"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Verwijder Alles"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Wachtrij leegmaken"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Verwijder onbeschikbare bestanden"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Verwijder duplicaten"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Verwijder niet geselecteerde"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Verwijder geselecteerde"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Zoek en selecteer"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Selectie omkeren"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Selecteer geen enkele"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Selecteer alles"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Volgens nummer"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Volgens artiest"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Volgens album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Volgens Album Artiest"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Volgens Uitgave Datum"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Volgens Genre"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Volgens Lengte"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Volgens Aangepaste Titel"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Herschik lijst in willekeurige volgorde"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Lijst omkeren"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Sorteer het geselecteerde"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Sorteer lijst"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Knip"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopieer"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Plak"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Queue/Unqueue"
 
@@ -3382,15 +3475,15 @@ msgstr "Audacious Afspeellijst Bewerker"
 msgid "%s (%d of %d)"
 msgstr "%s (%d van %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp Klassieke Interface"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3478,7 +3571,7 @@ msgid "Slow"
 msgstr "Traag"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Matig"
 
@@ -3610,7 +3703,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3632,67 +3725,67 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio Uitvoer"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Apparaat (leeg voor standaardwaarde):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Volume opslaan en herstellen:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Opdrachten</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Opdracht uitvoeren wanneer een nieuw lied start:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Opdracht uitvoeren aan het eind van een lied:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Opdracht uitvoeren aan het eind van een afspeellijst:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Opdracht uitvoeren wanneer de songtitel verandert (voor netwerk streams):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3707,21 +3800,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3735,43 +3828,43 @@ msgstr ""
 "Gebaseerd op de Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Snel"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Laag"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Hoog"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Erg Hoog"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Snelheid en Pitch"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Snelheid en Pitch</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Pitch:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Status Icoon"
 
@@ -3860,12 +3953,12 @@ msgstr "<b>Extra Stereo"
 msgid "Tone Generator"
 msgstr "Toon Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Toon Generator:"
 
@@ -3882,7 +3975,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Stem Opheffing"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3931,26 +4024,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Decoder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Decoder"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3964,14 +4067,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Decoder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF Configuratie</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Negeer de lengte van het bestand"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5c1a46b..77a3953 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,6 +4,7 @@
 #
 # Translators:
 # Chris <259095+transifex@gmail.com>, 2012
+# a b <tmp57@tlen.pl>, 2016
 # HrabiaN <bohopicasso@gmail.com>, 2015
 # Chris <259095+transifex@gmail.com>, 2012
 # Chris <259095+transifex@gmail.com>, 2012
@@ -24,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-12-17 14:18+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-14 17:57+0000\n"
+"Last-Translator: a b <tmp57@tlen.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/jlindgren/audacious/language/"
 "pl/)\n"
 "Language: pl\n"
@@ -36,7 +37,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Dekoder AAC (surowe dane)"
 
@@ -44,20 +45,20 @@ msgstr "Dekoder AAC (surowe dane)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Odtwarzacz AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sekwencjonowane"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Ustaw alarm..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -66,7 +67,7 @@ msgstr ""
 "Wtyczka do zaplanowania odtwarzania w określonym czasie.\n"
 "Pierwotni autorzy: Adam Feakin i Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -164,147 +165,147 @@ msgstr ""
 "    Wpisz treść komunkatu i zaznacz odpowiednią\n"
 "    opcję, jeśli chcesz, aby było ono pokazywane.."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "To jest twój sygnał budzenia."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Twoje przypomnienie na dzisiaj to..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Przypominacz"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Środa"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Piątek"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Czas"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Domyślnie alarm o:"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "[hh:mm]"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Wyciszenie po:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "godziny"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuty"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Wybierz dni, w których alarm będzie aktywny"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dzień"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dni"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Czas przejścia"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Głośność"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Początkowa"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Końcowa"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Bieżąca"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Dodatkowe polecenie"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "włącz"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista odtwarzania (opcjonalnie)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Wybierz listę odtwarzania"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Ustawienia"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Co oznaczają te ustawienia?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Okładka albumu"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Wyjście ALSA"
 
@@ -346,11 +347,11 @@ msgstr "Urządzenie miksera:"
 msgid "Mixer element:"
 msgstr "Element miksera:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Odtwarzacz MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -392,68 +393,68 @@ msgstr ""
 "Tony'ego Vroona\n"
 "za pomoc w testowaniu wersji alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Zmień domyślną głośność:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Zmień domyślną polifonię:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Zmień domyślne echo:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Włączone"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Zmień domyślny chorus:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Odtwarzanie</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Przesunięcie:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "półtony"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Przesunięcie perkusji:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numery nut"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Przeskocz ciszę na wprowadzeniu"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Przeskocz ciszę na zakończeniu"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>Czcionka</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Syntezator</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Częstotliwość próbkowania:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -461,86 +462,106 @@ msgstr "Częstotliwość próbkowania:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - wybierz plik czcionki"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Wielkość (w bajtach)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Informacje MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Długość (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Liczba utworów:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "zmienna"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "Uderzenia na minutę:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "Uderzenia na minutę (średnia ważona):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Podział czasu:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Komentarze i teksty utworów MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* brak dostępnych komentarzy w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* brak dostępnych tekstów utworów w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (niepoprawne kodowanie UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Przeglądarka Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Przeglądarka Ampache\n"
+"\n"
+"Klient Ampache dla Audacious.\n"
+"\n"
+"Licencja: GNU GPLv3\n"
+"Prawa autorskie (C) Róbert Čerňanský i John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -559,7 +580,7 @@ msgstr ""
 "Wykorzystano fragmenty kodu biblioteki Ghosd Evana Martina:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (informacja ekranowa)"
 
@@ -614,94 +635,94 @@ msgstr "Wznów"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Wyświetla informację ekranową po wznowieniu odtwarzania."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Rozmieszczenie"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Przesunięcie wzdłuż osi X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Przesunięcie wzdłuż osi Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maksymalna szerokość informacji:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Wiele ekranów"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Wyświetlanie informacji ekranowej na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "wszystkie ekrany"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "ekran %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Czas (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Wyświetlanie:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Pojawianie się:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Zanikanie:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Czcionka %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Kształt"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Kolor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Włączenie"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Zdarzenia"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Wykryto menedżer okien obsługujący kompozycje"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -711,62 +732,58 @@ msgstr ""
 "Aby menu ekranowe było wyświetlanie prawidłowo, należy uruchomić menedżer "
 "okien obsługujący kompozycje (np. Compiz)."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Menedżer okien obsługujący kompozycje nie jest wymagany dla udawanej "
 "przezroczystości"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Przezroczystość"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Udawana przeźroczystość"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Prawdziwa przezroczystość (wymaga rozszerzenia X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Nie wczytano rozszerzenia kompozycji"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Rozszerzenie kompozycji jest niedostępne"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animacja"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Obramowanie"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Wyzwalanie"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Różne"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Przetestuj"
 
@@ -782,11 +799,11 @@ msgstr "Listy odtwarzania ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listy odtwarzania Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Kolor</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Rozmyty zakres"
 
@@ -810,15 +827,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Częstotliwość obcięcia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analizator spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Wtyczka Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -839,118 +856,118 @@ msgstr ""
 "\n"
 "Zrealizowano w ramach programu Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Urządzenie</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Prędkość odczytu:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Zastąp urządzenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadane</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Użyj CD-Tekstu"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Użyj CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Używanie protokołu HTTP zamiast CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nie udało się zainicjalizować podsystemu cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nieprawidłowy URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Ścieżka %d nie znaleziona."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Ścieżka %d jest ścieżką danych."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Wystąpił błąd przy odczycie płyty CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nie udało się otworzyć urządzenia CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Nie znaleziono napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nie udało się zainicjalizować otwarcia napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Nie udało się odzyskać pierwszego/ostatniego numeru ścieżki."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Nie mogę odczytać LSN początku/końca ścieżki %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Nie udało się połączyć z cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Nie udało się odczytać informacji z cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Brak płyty w napędzie."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nieobsługiwany rodzaj płyty."
 
@@ -1122,58 +1139,60 @@ msgstr "Intensywność:"
 msgid "Crystalizer"
 msgstr "Krystalizator"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Wtyczka Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Usuń pliki"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Nie udało się przenieść %s do kosza: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Nie udało się usunąć %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Nie udało się usunąć %s: to nie jest plik lokalny."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Czy chcesz usunąć zaznaczone pliki do kosza?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Przesuń do kosza"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Czy chcesz całkowicie usunąć zaznaczone pliki?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Usuń zaznaczone pliki"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Sposób usuwania</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Przesuń do kosza zamiast kasować"
 
@@ -1216,11 +1235,11 @@ msgstr "Głośność:"
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Wtyczka FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1236,15 +1255,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Zapis do pliku"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Wybór katalogu"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1275,194 +1290,278 @@ msgstr ""
 "- napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Format pliku wyjściowego:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Zapisywanie w pierwotnym położeniu"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Zapisywanie we własnym położeniu:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Utwórz nazwę pliku z:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Pierwotna nazwa pliku"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Pierwotna nazwa pliku (brak sufiksu)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Pierwotny znacznik pliku"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Dodanie do nazwy pliku numeru ścieżki"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Ogólne"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Połączone stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Jakość algorytmu:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Wyjściowa częstotliwość próbkowania:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tempo bitowe / współczynnik kompresji:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Jakość algorytmu:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Tempo transmisji (kb/s):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Współczynnik kompresji:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Kanały:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "tryb audio:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Różne:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Wymuszenie ścisłej zgodności z ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Zabezpieczenie przed błędami"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Jakość"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Włączenie"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Zmienne tempo transmisji (VBR):"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimalna wartość (kb/s):"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Minimalny bitrate:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksymalna wartość (kb/s):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Maksymalny bitrate:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Wymuszenie wartości minimalnej"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Średni bitrate:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Średnie tempo transmisji (ABR):"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Średnia wartość (kb/s):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Jakość algorytmu VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Wymuszenie wartości minimalnej"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Pominięcie nagłówka Xing VBR"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Nagłówki ramki</b>"
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parametry klatek:"
-
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Oznaczenie prawem autorskim"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Oznaczenie jako oryginalne"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parametry ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Tagi ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Wymuś dodawanie tagów wersji 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Dodawanie tagów tylko wersji 1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Dodawanie tagów tylko wersji 2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Jakość"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Znaczniki"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Jakość (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Jakość (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Ogólne"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "bezstratna"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1474,7 +1573,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1482,19 +1581,19 @@ msgstr ""
 "Wtyczka GIO dla Audaciousa\n"
 "Prawa autorskie 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Wtyczka GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Tryb odczytu i dołączania nie jest obsługiwany"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Nieprawidłowy tryb otwierania"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1514,32 +1613,10 @@ msgstr ""
 "\n"
 "Licencja: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizator spektrum OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analizator spektrum OpenGL dla Audaciousa\n"
-"Prawa autorskie: 2013 Christophe Budé, John Lindgren i Carlo Bramini\n"
-"Prawa autorskie 2014 William Pitcock\n"
-"\n"
-"Na podstawie wtyczki XMMS-a:\n"
-"Prawa autorskie 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson i 4Front Technologies\n"
-"\n"
-"Licencja: GPL wersja 2 i późniejsze"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Skróty GNOME"
@@ -1560,8 +1637,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Numer porządkowy"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Tytuł"
@@ -1618,8 +1695,8 @@ msgstr "Dostępne kolumny"
 msgid "Displayed columns"
 msgstr "Wyświetlane kolumny"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Narzędzie wyszukiwania"
 
@@ -1647,335 +1724,338 @@ msgstr "Odczep"
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Otwórz pliki ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Otwórz adres _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Dodaj pliki ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Dodaj adres U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "_Wyszukaj w bibliotece"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "O _programie ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Ustawienia"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Odtwarzaj"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Wstrzymaj"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "P_oprzednie"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Następne"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Powta_rzanie"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Losowo"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Losowa kolejność albu_mów"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Odtwarzaj _pojedynczo"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Z_atrzymaj odtwarzanie po tym utworze"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informacje o ścieżce..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Przejdź do _czasu..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Przejdź do ścież_ki..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Ustaw punkt początkowy pętli"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Ustaw punkt końcowy pętli"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Resetuj punkty graniczne pętli"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "według _tytułu"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Według _nazwy pliku"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "według ścieżki _pliku"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "według _numeru ścieżki"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "według _wykonawcy"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "według al_bumu"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "według wykonawcy albu_mu"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "według daty w_ydania"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Według _gatunku"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "według _długości"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "według p_ołożenia pliku"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "według wła_snego tytułu"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_Odwróć kolejność"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Wy_losuj kolejność"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Odtwórz/Ponów"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Wczytaj ponownie"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sortuj"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Sortuj _wybrane"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Usuń _duplikaty"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_Usuń niedostępne pliki"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nowa"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Z_mień nazwę..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Usuń"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importuj..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Eksportuj..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Menedżer _listy odtwarzania..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Menedżer _kolejki..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Z_większ głośność"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Z_mniejsz głośność"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Korektor graficzny..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_fekty..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "Nag_raj strumień"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "U_stawienia dźwięku..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Pasek _menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Pasek _informacji"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Pokaż pasek wiz_ualizacji"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Pokaż pasek _stanu"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Pokaż _pozostały czas"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Wizualizacje"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "Odt_warzanie"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "W_tyczki"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Dźwięk"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Widok"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Dodaj/usuń kolejkę"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "Odśwież zaznaczone"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "K_opiuj"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Wklej na końcu"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_Zaznacz wszystko"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Z_mień nazwę ..."
 
@@ -2016,33 +2096,32 @@ msgstr "Przyciski strzałki przesuwają o:"
 msgid "Scroll on song change"
 msgstr "Przewiń przy zmianie piosenki"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interfejs GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Buforowanie ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2050,25 +2129,25 @@ msgstr[0] "%d kanał"
 msgstr[1] "%d kanały"
 msgstr[2] "%d kanałów"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Tryb prosty."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Tryb listy odtwarzania."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Zatrzymaj po tym utworze."
 
@@ -2076,9 +2155,9 @@ msgstr "Zatrzymaj po tym utworze."
 msgid "Previous track"
 msgstr "Poprzedni utwór"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Odtwarzaj"
 
@@ -2086,8 +2165,8 @@ msgstr "Odtwarzaj"
 msgid "Pause/Resume"
 msgstr "Wstrzymaj/wznów"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Zatrzymaj"
 
@@ -2187,7 +2266,7 @@ msgstr "<b>Kombinacja klawiszy:</b>"
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globalne skróty klawiszowe"
 
@@ -2218,25 +2297,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Wyjście JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Automatycznie połącz z portami wyjścia"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Odnaleziono tylko %d portów wyjścia JACK, ale wymaganych jest %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Wystąpił błąd przy połączeniu z portem JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2244,11 +2323,11 @@ msgstr ""
 "JACK obsługuje tylko dźwięk zmiennoprzecinkowy. Musisz zmienić rozdzielczość "
 "bitową w ustawieniach dźwięku Audaciousa na tryb zmiennopozycyjny."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Wystąpił błąd przy połączeniu z serwerem JACK. Czy jest uruchomiony?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2353,48 +2432,48 @@ msgstr "Podłącz ponownie do serwera LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Odczekaj przed ponownym połączeniem:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Wtyczka LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Nie znaleziono tekstu piosenki"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Błąd"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nie można pobrać %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nie można odczytać %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Szukanie tekstu piosenk i ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Brakujące metadane utworu"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Łączenie z lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Edycja tekstu..."
 
@@ -2406,17 +2485,17 @@ msgstr "Lista odtwarzania M3U"
 msgid "Tact Generator"
 msgstr "Generator taktu"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generator taktu: %d uderzeń na minutę"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generator taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2573,15 +2652,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "Wtyczka MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Zaawansowane</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Użyj dokładnego obliczania długości (wolne)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Dźwięk przestrzenny"
 
@@ -2593,35 +2672,35 @@ msgstr "Serwer MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Wtyczka Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Błąd przetwarzania przekierowania"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Nieznany błąd HTTP"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Błąd przetwarzania adresu URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Za dużo przekierowań"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious nie odtwarza."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Powiadomienia na pulpicie"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2659,15 +2738,15 @@ msgstr ""
 "Publicznej GNU (GNU General Public License); jeśli nie, odwiedź <http://www."
 "gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Pokaż kontrolki odtwarzania"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Zawsze pokazuj powiadomienia"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Dołącz nazwę albumu do powiadomienia"
 
@@ -2675,21 +2754,21 @@ msgstr "Dołącz nazwę albumu do powiadomienia"
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Następne"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Wyjście OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Wyjście OSS3"
 
@@ -2732,23 +2811,23 @@ msgstr ""
 "Tony'emu Vroonowi oraz Johnowi Lindgrenowi, a także, naturalnie, autorom "
 "poprzedniej wtyczki OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Menedżer list odtwarzania"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Wpisy"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Zmień nazwę"
 
@@ -2760,53 +2839,49 @@ msgstr "Listy odtwarzania PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Dekoder OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Wyjście PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Wtyczka wyjścia PulseAudio dla Audaciousa\n"
-"Niniejszy program jest wolnym oprogramowaniem; możesz go\n"
-"rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\n"
-"Licencji Publicznej GNU, wydanej przez Fundację Wolnego\n"
-"Oprogramowania - według wersji 2-giej tej Licencji lub którejś\n"
-"z późniejszych wersji. \n"
-"\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on \n"
-"użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej \n"
-"gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH \n"
-"ZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna \n"
-"Licencja Publiczna GNU. \n"
-"\n"
-"Z pewnością wraz z niniejszym programem otrzymałeś też egzemplarz \n"
-"Powszechnej Licencji Publicznej GNU (GNU General Public License);\n"
-"jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-
-#: src/qtaudio/qtaudio.cc:49
+"Plugin wyjściowy Audacious PulseAudio\n"
+"\n"
+"Ten program jest darmowym oprogramowaniem; możesz go re-dystrybuować i/lub "
+"modyfikować zgodnie z warunkami licencji GNU General Public License, która "
+"została opublikowana przez Free Software Foundation; zarówno w wersji 2 lub "
+"(wedle życzenia) którejkolwiek późniejszej wersji licencji.\n"
+"\n"
+"Ten program jest dystrybuowany w nadziei, że będzie użyteczny, ale BEZ "
+"JAKIEJKOLWIEK GWARANCJI; Nawet bez domyślnej gwarancji HANDLOWEJ lub "
+"PRZYDATNOŚCI DO OKREŚLONEGO CELU.  Zobacz licencję GNU General Public "
+"License w celu poznania szczegółów.\n"
+"\n"
+"Powinieneś otrzymać kopię licencji GNU General Public License razem z tym "
+"programem; Jeżeli tak się nie stało, napisz do Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Wyjście QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2820,47 +2895,73 @@ msgstr ""
 "Oparta na wtyczce wyjścia SDL dla Audacious\n"
 "Prawa autorskie 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizator spektrum OpenGL dla Audaciousa\n"
+"Prawa autorskie: 2013 Christophe Budé, John Lindgren i Carlo Bramini\n"
+"Prawa autorskie 2014 William Pitcock\n"
+"\n"
+"Na podstawie wtyczki XMMS-a:\n"
+"Prawa autorskie 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson i 4Front Technologies\n"
+"\n"
+"Licencja: GPL wersja 2 i późniejsze"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Działanie..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informacje"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Otwórz katalog..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Dodaj katalog..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Dziennik programu"
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Otwórz pliki"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Dodaj pliki"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Poprzednie"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Powtarzaj"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Losowa kolejność"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Otwórz katalog..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Dodaj katalog..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Dziennik programu"
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interfejs Qt"
 
@@ -2904,7 +3005,7 @@ msgstr "<b>Konwersja</b>"
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Klasa:"
 
@@ -2956,59 +3057,47 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK, Scrobblowanie dla użytkownika: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Brak zezwolenia"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Sprawdzam dostęp do Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Użyj tego linku by zezwolić Audacious na scrobblowanie twoich utworów."
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Pozostaw to okno otwarte i naciśnij ponownie 'Sprawdź Uprawnienia'.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Nie martw się. Twoje scrobblowanie zostało zapisane na komputerze.\n"
-"Będą przekazane do Audacious tak szybko jak tylko będzie miał na to "
-"pozwolenie."
+"Twoje nazwy odtworzonych utworów są tymczasowo zapisywane na twoim "
+"komputerze. Zostaną wysłane kiedy tylko Audacious będzie miał dostęp."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problem z siecią."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Uprawnienia przyznane.  Scrobbling dla użytkownika %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Wystąpił problem przy skontaktowaniu się z Last.fm. Proszę spróbuj ponownie."
+"Brak uprawnień. Otwórz następujący URL w przeglądarce, zezwól Audacious na "
+"dostęp do swojego konta i następnie kliknij ponownie 'Sprawdź uprawnienia':"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Sprawdzanie..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Wystąpił problem łączenia z Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "S_prawdź zezwolenia"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Sprawdź uprawnienia."
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "U_nieważnij pozwolenia"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Unieważnij uprawnienia."
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Musisz zezwolić Audacious na scrobblowanie utworów do twojego konta Last."
-"fm.\n"
+"Musisz pozwolić Audacious wysyłać nazwy utworów do swojego konta Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3039,7 +3128,7 @@ msgstr ""
 "Podziękowania dla John Lindgren za wsparcie na początku projektu.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3047,11 +3136,11 @@ msgstr ""
 "Audacious używa obecnie poprawionej wersji Scrobblera Last.fm.\n"
 "Proszę sprawdź ustawienia dla wtyczki Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Wyjście SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3059,13 +3148,13 @@ msgstr ""
 "Wtyczka wyjścia SDL dla Audacious\n"
 "Prawa autorskie 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteka"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -3073,7 +3162,7 @@ msgstr[0] "%d wynik"
 msgstr[1] "%d wyniki"
 msgstr[2] "%d wyników"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -3081,7 +3170,7 @@ msgstr[0] "(%d ukryty)"
 msgstr[1] "(%d ukryte)"
 msgstr[2] "(%d ukrytych)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3089,31 +3178,31 @@ msgstr[0] "%d piosenka"
 msgstr[1] "%d piosenki"
 msgstr[2] "%d piosenek"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "tego gatunku"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "na"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "przez"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Utwórz listę odtwarzania"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Dodaj do listy odtwarzania"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Przeszukaj bibliotekę"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3121,11 +3210,11 @@ msgstr ""
 "Aby zaimportować kolekcję muzyczną, proszę wybrać katalog i kliknąć przycisk "
 "ponownego wczytywania."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Proszę czekać ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Wybierz katalog"
 
@@ -3221,15 +3310,15 @@ msgstr "Próg:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Zresetowano punkty graniczne pętli."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Ustawiono punkt początkowy pętli."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Ustawiono punkt końcowy pętli."
 
@@ -3281,373 +3370,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Korektor graficzny Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Głośność: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balans: %d%% lewy"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Balans: centralny"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balans: %d%% prawy"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu opcji"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Wyłącz 'Zawsze na wierzchu'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Włącz 'Zawsze na wierzchu'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Obszar informacji o pliku"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Podwójny rozmiar"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Wizualizacje"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Nagrywanie włączone"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Nagrywanie wyłączone"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Zwiększenie głośności"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Zmniejszenie głośności"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efekty..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Nagraj strumień"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Ustawienia dźwięku..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Otwórz pliki..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Otwórz URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Wyjście"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Widok"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Usługi"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
-msgstr "O..."
+msgstr "O programie..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Ustawienia..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Zakończ"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Informacje o piosence..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Losowa kolejność albumów"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Odtwarzaj pojedynczo"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Zatrzymaj odtwarzanie po tym utworze"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Ustaw powtarzanie od punktu A do punktu B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Usuń powtarzanie A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Przejdź do piosenki..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Przejdź do czasu..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Odtwórz/Ponów"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Zmień nazwę listy odtwarzania..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Poprzednia lista odtwarzania"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Następna lista odtwarzania"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importuj listę odtwarzania..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Eksportuj listę odtwarzania..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Menedżer list odtwarzania..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Menedżer kolejki..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Odśwież listę odtwarzania"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Okno listy odtwarzania"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Okno korektora graficznego"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Pokaż pozostały czas"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Na wszystkich pulpitach"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Zwiń odtwarzacz"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Zwiń okno listy odtwarzania"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Zwiń okno korektora graficznego"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Dodaj adres URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Dodaj pliki..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Według tytułu"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Według nazwy pliku"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Według ścieżki dostępu"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Usuń wszystkie"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Wyczyść kolejkę"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Usuń niedostępne"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Usuń duplikaty"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Usuń niezaznaczone"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Szukaj i wybierz"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Wyczyść zaznaczenie"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "według numeru ścieżki"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "według wykonawcy"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "według albumu"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "według wykonawcy albumu"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "według daty wydania"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Według gatunku"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Według długości"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Według własnego tytułu"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Wymieszaj listę odtwarzania"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Odwróć kolejność listy odtwarzania"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Posortuj zaznaczone"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Sortuj"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Otwórz nadrzędny katalog"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Wklej na końcu"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Przełącz kolejkę"
 
@@ -3660,15 +3757,15 @@ msgstr "Edytor listy odtwarzania Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Klasyczny interfejs Winampa"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Otwórz katalog..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Dodaj katalog..."
 
@@ -3756,7 +3853,7 @@ msgid "Slow"
 msgstr "Wolny"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Średni"
 
@@ -3892,7 +3989,7 @@ msgstr "Utwórz nową playlistę z pasującymi wpisami"
 msgid "Sndfile Plugin"
 msgstr "Wtyczka Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3933,68 +4030,71 @@ msgstr ""
 "napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Wyjście Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Urządzenie (puste oznacza domyślne):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Zapisz i przywróć głośność:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Błąd Sndio: Nieobsługiwany format dźwięku (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Błąd Sndio: funkcja sio_open() zwróciła błąd"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Błąd Sndio: funkcja sio_setpar() zwróciła błąd"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Błąd Sndio: funkcja sio_start() zwróciła błąd"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Polecenie przy zmianie ścieżki"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Polecenia</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Polecenie do uruchomienia przy rozpoczęciu nowej piosenki:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Polecenie do uruchomienia przy zakończeniu piosenki:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Polecenie do uruchomienia przy zakończeniu listy odtwarzania:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Polecenie do uruchomienia, gdy zmieni się tytuł piosenki (dla "
 "strumieniowania sieciowego):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
+"Możesz użyć następujących kodów formatujących, które zostaną zastąpione "
+"przed uruchomieniem polecenia (nie wszystkie są użyteczne dla polecenia end-"
+"of-playlist):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -4008,8 +4108,19 @@ msgid ""
 "%t: Playlist position\n"
 "%T: Title (unformatted)"
 msgstr ""
-
-#: src/song_change/song_change.cc:296
+"%a: Wykonawca\n"
+"%b: Album\n"
+"%c: Liczba kanałów\n"
+"%f: Nazwa pliku (pełna ścieżka)\n"
+"%F: Częstotliwość (Herce)\n"
+"%l: Długość (milisekundy)\n"
+"%n lub %s: Sformatowany tytuł (zobacz ustawienia listy odtwarzania)\n"
+"%p: Teraz gra (1 lub 0)\n"
+"%r: Rate (bitów na sekundę)\n"
+"%t: Pozycja listy odtwarzania\n"
+"%T: Tytuł (niesformatowany)"
+
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4017,15 +4128,15 @@ msgstr ""
 "Parametry przekazywane do powłoki powinny być zawarte w cudzysłowach. Ich "
 "brak może prowadzić do nieoczekiwanych rezultatów."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Informacje o nagraniu"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Konwerter częstotliwości SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4039,43 +4150,43 @@ msgstr ""
 "Oparty na wtyczce Sample Rate Converter:\n"
 "Prawa autorskie 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Szybki"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Wolny"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Wysoki"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Bardzo wysoki"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Szybkość i wysokość tonu"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Szybkość i wysokość tonu</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Szybkość:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Wysokość tonu:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikona statusu"
 
@@ -4176,12 +4287,12 @@ msgstr "<b>Dodatkowe stereo</b>"
 msgid "Tone Generator"
 msgstr "Generator sygnałów"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generator sygnałów: "
 
@@ -4205,7 +4316,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Usuwanie głosu (karaoke)"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4282,7 +4393,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4293,19 +4404,31 @@ msgstr ""
 "ru>\n"
 "Wtyczka Audaciousa napisana przez Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Wtyczka Win32 waveOut dla Audacious\n"
+"Prawa autorskie 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "stratna (hybryda)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "stratna"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4319,32 +4442,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Konfiguracja XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorowanie czasu trwania z pliku"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Współdzielone listy odtwarzania XML (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Przenikanie ścieżek zawiodło, ponieważ piosenki miały różną liczbę "
-#~ "kanałów. Możesz użyć Miksera kanałów, by przekonwertować piosenki do tej "
-#~ "samej liczby kanałów."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Wtyczka przenikania ścieżek zawiodła, gdyż utwory posiadają różną "
-#~ "częstotliwość próbkowania. Możesz użyć konwertera częstotliwości "
-#~ "próbkowania, aby sprowadzić utwory do tej samej częstotliwości."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 93df27a..77b46f5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,12 +6,15 @@
 # Alexandro Casanova <shorterfire@gmail.com>, 2013
 # Conservador Ressurge, 2014
 # Eudes Soares <eudes.sp2007@gmail.com>, 2014
-# F Marcelo O Amarante <marcelo.amarante@hotmail.com>, 2015
+# F Marcelo O Amarante, 2015
 # Fuad Saud <fuadksd@gmail.com>, 2012
 # mcnd2 <glauber_gf@hotmail.com>, 2012
 # John_Norum <john.norum4@gmail.com>, 2012
+# Jorgebadad <jorgebadad@gmail.com>, 2016
 # Bruno Bacelar <mail2buy8@gmail.com>, 2012
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2012
+# Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
+# Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
 # Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2012
 # Alexandro Casanova <shorterfire@gmail.com>, 2012-2013
 # vitorgatti <vitorgatti@yahoo.com.br>, 2012
@@ -20,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 23:00+0000\n"
-"Last-Translator: F Marcelo O Amarante <marcelo.amarante@hotmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-09 16:37+0000\n"
+"Last-Translator: Rodrigo de Araujo <araujorodrigo1984@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/jlindgren/"
 "audacious/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -31,28 +34,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
-msgstr "Decodificador AAC(Bruto)"
+msgstr "Decodificador AAC (Bruto)"
 
 #: src/adplug/adplug-xmms.cc:42
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sequenciado"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Definir Alarme ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -63,7 +66,7 @@ msgstr ""
 "\n"
 "Originalmente escrito por Adam Feakin e Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -114,147 +117,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
-msgstr "Este é o seu alerta."
+msgstr "Este é o seu alerta de despertar."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Seu lembrete para hoje é..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Horário"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarme às (padrão):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silenciar após:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Escolha os dias para o alarme tocar"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dia"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Padrão"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
-msgstr "Enfraquecimento"
+msgstr "Desvanecimento"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
-msgstr "Começar no"
+msgstr "Começar às"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Atual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando Adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "habilitar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de Reprodução (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Selecionar uma Lista de Reprodução"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opções"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "O que significam estas opções?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Capa do Álbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
@@ -298,11 +301,11 @@ msgstr "Dispositivo mixer:"
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -344,68 +347,68 @@ msgstr ""
 "Tony Vroon\n"
 "pela boa ajuda com os testes alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Sobrescrever ganho padrão:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Sobrescrever polifonia padrão:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Sobrescrever reverberação padrão:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ativo"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Sobrescrever coro padrão:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reprodução</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposição:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Mudança de bateria:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "número de notas"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Pular silêncio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Pular silêncio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetizador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Taxa de amostragem:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -413,86 +416,100 @@ msgstr "Taxa de amostragem:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - Selecione o arquivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nome do Arquivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\">Informações MIDI</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Duração (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "N.º de Faixas;"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Comentários de MIDI e Letras </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* Sem comentários disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Sem letras disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 invalido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Navegador Ampache "
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -511,7 +528,7 @@ msgstr ""
 "Baseado parcialmente na biblioteca Ghosd de Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (OSD)"
 
@@ -563,94 +580,94 @@ msgstr "Despausar"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Ativar OSD ao retomar a reprodução"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Localização"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Desvio X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Desvio Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Largura máxima do OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opções de múltiplos monitores "
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Exibir uso do OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Duração (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Exibição:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Aparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Desaparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Tipo de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo de renderização"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Habilitar gatilho"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento "
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Gerenciador Composite detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -660,60 +677,56 @@ msgstr ""
 "ao menos que você saiba que tenha executado, por favor ative um gerenciador "
 "composite, caso contrario o OSD não vai funcionar corretamente "
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Não é necessário o gerenciador Composite para falsa transparência."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparência  "
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Falsa transparência  "
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparência Real (requer a Extensão X Composite.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Extensão Composite não carregada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensão Composite não disponível"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posição"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animação"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoração"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Gatilho"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Vários"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Teste"
 
@@ -729,11 +742,11 @@ msgstr "Listas de Reproduções ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de Reproduções Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Cor</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Ofuscar Escopo"
 
@@ -757,15 +770,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analisador Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de Áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -786,118 +799,118 @@ msgstr ""
 "\n"
 "Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocidade de Leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Substituir dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadados</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Use HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falha ao iniciar o subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI Inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Erro ao ler CD de áudio. "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Falha ao abrir dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Não se encontrou drive de CD capaz de reproduzir áudio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Falha ao terminar de inicializar drive de CD aberto."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Falha ao recuperar primeiro/ultimo número de faixa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Não foi possível começar/terminar LSN da faixa %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Falha ao criar a conexão cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Falha ao consultar o servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Falha ao consultar o servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Falha ao ler as informações cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Unidade está vazia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco não suportado."
 
@@ -946,7 +959,7 @@ msgid ""
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
-"Engine decodificador de musicas de console, baseado no Game_Music_Emu 0.5.2\n"
+"Engine decodificador de músicas de console, baseado no Game_Music_Emu 0.5.2\n"
 "Formatos suportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
 "Plugin Audacious por:\n"
@@ -1067,58 +1080,60 @@ msgstr "Intensidade:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Excluir Arquivos"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Erro ao mover %s para lixeira: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Erro ao deletar %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Erro apagando %s: não é um arquivo local."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Deseja mover os arquivos selecionados para a lixeira?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Mover para Lixeira"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Deseja excluir permanentemente os arquivos selecionados?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Excluir Arquivos Selecionados"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Excluir Método</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover para a lixeira ao invés de excluir imediatamente"
 
@@ -1160,11 +1175,11 @@ msgstr "Volume:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1181,15 +1196,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>."
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Escolha uma pasta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1219,194 +1230,278 @@ msgstr ""
 "programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato de saída do arquivo:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Salvar no diretório original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Salvar no diretório personalizado:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Gerar nome de arquivo a partir de:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nome do arquivo original"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nome do arquivo original (sem sufixo)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta do arquivo original"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Acrescentar número da faixa no início do nome do arquivo"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Geral"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automático"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Qualidade do Algorítimo:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Taxa de Amostragem de Saída:"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de compressão:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Taxa de dados (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Taxa de compressão:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Modo de áudio:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Modo de Áudio:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Diversos:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Assegurar o estrito cumprimento da ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualidade"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Ativar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opções VBR"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa mínima (kbps)"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa máxima (kbps)"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Cumprir rigorosamente taxa de bits mínima"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opções ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Taxa média (kbps)"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Nível de qualidade VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Cumprir rigorosamente taxa de bits mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omitir cabeçalho Xing VBR"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parâmetros da Estrutura:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Assinalar como Direitos Autorais"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Assinalar como original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parâmetros ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forçar adição de tag, versão 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Somente adicionar tag v1 "
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Somente adicionar tag v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Nível de Qualidade (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Geral"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAG"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sem perdas"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1418,7 +1513,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1426,19 +1521,19 @@ msgstr ""
 "Plugin GIO para Audacious\n"
 "Direitos Autorais 2009-2012 John Lindgren."
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo Ler-e-anexar não suportado"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo de abertura inválido"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1458,32 +1553,10 @@ msgstr ""
 "\n"
 "Licença: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analisador Espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analisador de Espectro OpenGL para Audacious\n"
-"Direitos Autorais 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
-"Direitos Autorais 2014 William Pitcock\n"
-"\n"
-"Baseado no plugin XMMS:\n"
-"Direitos Autorais 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, e 4Front Technologies\n"
-"\n"
-"Licença: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Atalhos do GNOME"
@@ -1504,8 +1577,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1562,8 +1635,8 @@ msgstr "Colunas disponíveis"
 msgid "Displayed columns"
 msgstr "Colunas visíveis"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Ferramenta de Busca"
 
@@ -1591,335 +1664,338 @@ msgstr "Desencaixar"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Abrir Arquivo(s) ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Adicionar Arquivo(s) ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Pesquisar _Biblioteca"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "S_obre ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Configurações ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Paus_ar"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Parar"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Próxima"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "E_mbaralhar"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Embaralhar por Álbu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "N_enhum Avanço da Lista de Reprodução"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Parar D_epois Desta Faixa"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informações da faixa ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Ir para a faixa ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Definir Ponto de Repetição _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Definir Ponto de Repetição _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Limpar Pontos de Repetição"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Por _Nome de Arquivo"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Por Localização _do Arquivo"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Por Número _da Faixa"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Por _Artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Por Ál_bum "
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Por Art_ista do Álbum"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Por Data de _Lançamento"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Por _Gênero"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Por _Duração"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Por _Localização do Arquivo"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Por _Título Personalizado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "I_nverter Ordem"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Aleatório"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Reproduzir/Retomar"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Organizar Lista de Reprodução"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Organizar Se_lecionado"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Remover _Duplicatas"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Remover _Arquivos Indisponíveis"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Re_nomear ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportar"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Gerenciador de _Lista de Reprodução ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Gerenciador de Fila de Reprodução ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Aumentar _Volume"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Abaixar _Volume"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Equalizador ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_feitos"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Fluxo do arquivo"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Configurações _de Áudio ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de _Informação"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar vis_ualização da barra de informaçoes"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de _Status"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostrar _Tempo Restante"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualizações"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de Reprodução"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Saída"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Visualizar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Adicionar/Remover da Fila de Reprodução"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta de Conteúdo"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Colar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Selecionar _Tudo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Renomear ..."
 
@@ -1960,58 +2036,57 @@ msgstr "Teclas de setas procuram por:"
 msgid "Scroll on song change"
 msgstr "Deslocar ao mudar de faixa"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "A processar ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canais"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo simples."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo Lista de Reprodução."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Parar após faixa"
 
@@ -2019,9 +2094,9 @@ msgstr "Parar após faixa"
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproduzir"
 
@@ -2029,8 +2104,8 @@ msgstr "Reproduzir"
 msgid "Pause/Resume"
 msgstr "Pausa/Retornar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Parar"
 
@@ -2130,7 +2205,7 @@ msgstr "<b>Combinação de Teclas:</b>"
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Global Hotkeys"
 
@@ -2160,26 +2235,26 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>."
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Conectar-se automaticamente às portas de saída"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Apenas %d portas de saída JACK foram encontradas, mas %d são necessárias."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falha ao conectar a porta JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2188,11 +2263,11 @@ msgstr ""
 "profundidade de bits de saída para ponto-flutuante nas configurações do "
 "Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Falha ao conectar ao servidor JACK; Está em funcionamento?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2298,48 +2373,48 @@ msgstr "Reconectar ao servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Espere antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "A letra da faixa não está disponível"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Erro"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível analisar %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Procurando a letra da faixa ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Metadados da música faltando"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando no lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Editar letras ..."
 
@@ -2351,17 +2426,17 @@ msgstr "Listas de Reproduções M3U"
 msgid "Tact Generator"
 msgstr "Gerador Tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tacto: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tacto: %d bpm %d%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2516,15 +2591,15 @@ msgstr "Essas configurações entrarão em vigor quando Audacious for reiniciado
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG 123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avançado</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Usar cálculo exato da duração (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2536,35 +2611,35 @@ msgstr "Servidor MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro ao validar redirecionamento"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP desconhecido"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Erro ao validar URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Muitos redirecionamentos"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious não está tocando."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificações do Desktop"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2599,15 +2674,15 @@ msgstr ""
 "Você poderá receber uma copia de GNU General Public License junto a esse "
 "programa, se não, veja <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Mostrar controles de reprodução"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Sempre exibir notificação"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Incluir nome do álbum na notificação"
 
@@ -2615,21 +2690,21 @@ msgstr "Incluir nome do álbum na notificação"
 msgid "Show"
 msgstr "Exibir"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Próxima"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2671,23 +2746,23 @@ msgstr ""
 "Gostaria de agradecer as pessoas em #audacious, especialmente Tony Vroon e "
 "John Lindgren e a todos os autores anteriores do plugin OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gerenciador de Lista de Reprodução"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Ren_omear"
 
@@ -2699,51 +2774,34 @@ msgstr "Listas de Reproduções PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificador OpenPSF PDF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Plugin de saída Audacious Pulse Audio\n"
-"\n"
-"Este programa é um software livre, você pode redistribuir e/ou modifica-lo\n"
-"dentro dos termos da GNU General Public License, tal como publicado pela\n"
-"Free Software Foundation, tanto a versão 2 da licença, ou\n"
-"(a sua opção) qualquer versão posterior.\n"
-"\n"
-"Esse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER "
-"GARANTIA, mesmo sem garantia implicada de\n"
-"COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\n"
-"GNU General Public License para mais detalhes.\n"
-"\n"
-"Você poderá receber uma copia de GNU General Public License\n"
-"junto a esse programa; se não, escreva para Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2757,47 +2815,73 @@ msgstr ""
 "Baseado no Plugin de Saída SDL para Audacious\n"
 "Direitos Autorais 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analisador de Espectro OpenGL para Audacious\n"
+"Direitos Autorais 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
+"Direitos Autorais 2014 William Pitcock\n"
+"\n"
+"Baseado no plugin XMMS:\n"
+"Direitos Autorais 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, e 4Front Technologies\n"
+"\n"
+"Licença: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Processando ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informação"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Abrir Pasta ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Adicionar Pasta ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Inspector do Histórico ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Abrir arquivos"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Adicionar arquivos"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Embaralhar"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Abrir Pasta ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Adicionar Pasta ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Inspector do Histórico ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
@@ -2841,7 +2925,7 @@ msgstr "<b>Conversão</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2893,62 +2977,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling para o usuário: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permissão Negada"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Checando o acesso ao Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Acesse o link a seguir para permitir Audacious no scrobble em suas "
-"reproduções:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Mantenha esta janela aberta e clique em \"Verificar permissão' novamente.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Não se preocupe. Seus scrobbles são salvos no seu computador.\n"
-"Eles serão apresentados logo que Audacious é permitido fazê-lo."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema de Rede."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr ""
-"Houve um problema ao contactar Last.fm. Por favor, tente novamente mais "
-"tarde."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Houve um problema ao contactar Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Verificando..."
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Checar Permissão"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "V_erificar Permissão"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Revogar Permissão"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar Permissão"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Você precisa permitir Audacious para a reprodução de faixas scrobble na sua "
-"conta Last.fm.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2980,7 +3044,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2988,11 +3052,11 @@ msgstr ""
 "Audacious agora está usando uma versão melhorada do Last.fm Scrobbler.\n"
 "Por favor, verifique as Preferências do plugin Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3000,58 +3064,58 @@ msgstr ""
 "Plugin de Saída SDL para Audacious\n"
 "Direitos Autorais 2010 John Lindgren."
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d oculto)"
 msgstr[1] "(%d ocultos)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d faixa"
 msgstr[1] "%d faixas"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "deste gênero"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "sobre"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "por"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Criar Lista de Reprodução"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Adicionar à Lista de Reprodução"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Procurar biblioteca"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3059,11 +3123,11 @@ msgstr ""
 "Para importar sua biblioteca de música no Audacious, escolha uma pasta e em "
 "seguida no ícone \"atualizar\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Por favor aguarde ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Escolha pasta"
 
@@ -3159,15 +3223,15 @@ msgstr "Limite:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Repetir pontos apagados."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Repetir ponto de definição A."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Repetir ponto de definição B."
 
@@ -3219,373 +3283,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Esqualizador do Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Equilíbrio: %d%% esquerda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Equilíbrio centro"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Equilíbrio: %d%% direita"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu de Opções"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desativar 'Sempre No Topo'"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Ativar 'Sempre No Topo'"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caixa de Informações do Arquivo"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Tamanho Duplo"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualizações"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Iniciar gravação"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Encerrar gravação"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Aumentar Volume"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Diminuir Volume"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efeitos ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Fluxo do arquivo"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Configurações de Audio ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Abrir Arquivos ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Abrir URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Procurar Biblioteca"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reprodução:"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Saída"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Serviços"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Sobre ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Configurações ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Sair"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Informações da Faixa ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Embaralhar por Álbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Não Avançar a Lista de Reprodução"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Parar Após Esta Faixa"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Definir Repetição A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Limpar Repetição A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Ir para a Música ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Ir para Posição Temporal ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Reproduzir/Retomar"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nova Lista de Reprodução"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Renomear Lista de Reprodução ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Lista de Reprodução Anterior"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Próxima Lista de Reprodução"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importar Lista de Reprodução"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportar Lista de Reprodução ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Gerenciador de Lista de Reprodução ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Gerenciador de Fila de Reprodução ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Atualizar Lista de Reprodução"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostrar Editor da Lista de Reprodução"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostrar Equalizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Mostrar Tempo Restante"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sempre no Topo"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Em Todas as Áreas de Trabalho"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Minimizar Reprodutor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Editor de rolagem"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Minimizar Equalizador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Adicionar URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Adicionar Arquivos ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Por Nome de Arquivo"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Por Localização do Arquivo"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Remover Todos"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Apagar Fila de Reprodução"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Remover Arquivos Indisponíveis"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Remover Duplicatas"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Remover Desmarcada"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Remover Selecionados"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Pesquisar e Selecionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Não Selecionar"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Por Número da Faixa"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Por Album"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Por Artista do Álbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Por Data de Lançamento"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Por Gênero"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Por Duração"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Por Título Personalizado"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Randomizar Lista"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Reverter Lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Organizar Selecionado"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Organizar Lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Colar no final"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Adicionar/Remover da Fila de Reprodução"
 
@@ -3598,15 +3670,15 @@ msgstr "Editor de lista de reprodução do Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface Clássica Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Abrir Pasta ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Adicionar Pasta ..."
 
@@ -3694,7 +3766,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Médio"
 
@@ -3831,7 +3903,7 @@ msgstr "Criar uma nova lista de reprodução com as entradas correspondentes"
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3872,62 +3944,62 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (branco para o padrão):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Salvar e restaurar volume:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr " Erro do Sndio: Formato de áudio não suportado (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Erro do Sndio: sio_open() falhou"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Erro do Sndio: sio_setpar() falhou"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Erro do Sndio: sio_start() falhou"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Mudança de Faixa"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Comandos</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Comando a executar ao iniciar uma nova faixa:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Comando a executar no final de uma faixa:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando a executar no final da lista de reprodução:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando a executar ao mudar o título da faixa (para transmissões da "
 "internet):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3936,7 +4008,7 @@ msgstr ""
 "antes de executar o comando (nem todos são úteis para o comando de fim-de-"
 "lista de reprodução):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3962,7 +4034,7 @@ msgstr ""
 "%t: Posição da Lista de Reprodução\n"
 "%T: Título (sem formatação)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3970,15 +4042,15 @@ msgstr ""
 "Parâmetros passados para a estrutura devem ser colocados entre aspas. "
 "Parâmetros não cotadas podem levar a resultados inesperados."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Informações da Faixa"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Reamostrador SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3992,43 +4064,43 @@ msgstr ""
 "Baseado no Plugin Conversor de Taxa de Amostragem:\n"
 "Direitos Autorais 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Baixo"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Muito Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e Tom"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidade e Tom</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Tom:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícone de Status"
 
@@ -4132,12 +4204,12 @@ msgstr "<b>Stereo Extra</b>"
 msgid "Tone Generator"
 msgstr "Gerador de Tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Gerador de Tons:"
 
@@ -4160,7 +4232,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4237,7 +4309,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4248,19 +4320,29 @@ msgstr ""
 "Baseado em in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>."
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "com perdas (híbrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "com perdas"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4274,14 +4356,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuração XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorar duração do arquivo"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de Reprodução Compartilhável XML (XSPF)"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d6c6a62..6dbd60e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,14 +7,14 @@
 # Bruno Martins <bmomartins@gmail.com>, 2011
 # Pitxyoki <Pitxyoki@gmail.com>, 2013
 # Pitxyoki <Pitxyoki@gmail.com>, 2013
-# Sérgio Marques <smarquespt@gmail.com>, 2012-2015
+# Sérgio Marques <smarquespt@gmail.com>, 2012-2016
 # Alexandro Casanova <shorterfire@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-26 11:36+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/jlindgren/"
 "audacious/language/pt_PT/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Descodificador AAC (RAW)"
 
@@ -32,20 +32,20 @@ msgstr "Descodificador AAC (RAW)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sequencial"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Definir alarme..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Versão original desenvolvida por Adam Feakin e Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -106,147 +106,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Este é o seu alerta."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "O seu lembrete de hoje é:"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "segunda"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "terça"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "quarta"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "quinta"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "sexta"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "sábado"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "domingo"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Horário"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarme às (pré-definido):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Silenciar após:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "horas"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minutos"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Escolha os dias para o alarme tocar"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dia"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Pré-definido"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Desvanecimento"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Ao iniciar"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Ao terminar"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Atual"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "ativar"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Lista de reprodução (opcional)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Escolha a lista de reprodução"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Opções"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "O que significam estas opções?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Imagem de álbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sistema ALSA"
 
@@ -289,11 +289,11 @@ msgstr "Dispositivo misturador:"
 msgid "Mixer element:"
 msgstr "Elemento misturador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -335,68 +335,68 @@ msgstr ""
 "Tony Vroon\n"
 "pela ajuda nos testes"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Substituir ganho pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Substituir polifonia pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Substituir reverb pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ligado"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Substituir coro pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Reprodução</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposição:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Drum shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "número da nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Ignorar silêncio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ignorar silêncio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Sintetizador</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Frequência:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -404,86 +404,106 @@ msgstr "Frequência:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - selecione o ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Nome do ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\">Informações MIDI</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Duração (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "N.º de faixas:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\">Comentários e letras das faixas MIDI</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* sem comentários para este ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* sem letra da música para este ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Fe_char"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (UTF-8 inválido)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Explorador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Explorador Ampache\n"
+"\n"
+"Cliente Ampache para o Audacious.\n"
+"\n"
+"Licença: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský e John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -502,7 +522,7 @@ msgstr ""
 "Baseado na biblioteca Ghosd criada por Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Notificação no ecrã)"
 
@@ -554,94 +574,94 @@ msgstr "Ao retirar da pausa"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Ativar OSD ao retomar a reprodução."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Posicionamento"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Largura máxima do OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Opções de monitores múltiplos"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Mostrar OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "em todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "no monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Duração (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Exibição:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Aparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Desaparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Tipo de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Estilo"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Ativar"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Detetado um gestor de composição."
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -651,60 +671,56 @@ msgstr ""
 "A menos que tenha a certeza que o gestor está ativo, tem que ativar um "
 "gestor de composição para mostrar o OSD."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "A transparência fictícia não precisa de um gestor de composição"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Transparência"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Transparência fictícia"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparência efetiva (requer a extensão X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Extensão de composição não carregada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensão de composição não disponível"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Posição"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animação"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Decoração"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Ativador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Outras"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Teste"
 
@@ -720,11 +736,11 @@ msgstr "Listas de reprodução ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodução Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Cor</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -748,15 +764,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analisador de espetro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Suplemento Áudio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -777,118 +793,118 @@ msgstr ""
 "\n"
 "Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Dispositivo</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Velocidade de leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Sobrepor dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Detalhes</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Utilizar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Ocorreu um erro ao iniciar o sistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s inválido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Ocorreu um erro ao ler o CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "CD áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Ocorreu um erro ao abrir o dispositivo %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Não foi encontrada uma unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Ocorreu um erro ao iniciar a unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Ocorreu um erro ao obter o número da primeira/última faixa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Não foi possível ler inicio/fim LSN da faixa %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Ocorreu um erro ao criar a ligação à cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Ocorreu um erro ao consultar o servidor cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Ocorreu um erro ao consultar o servidor cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Ocorreu um erro ao ler as informações cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Unidade vazia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Tipo de disco não suportado."
 
@@ -1058,58 +1074,60 @@ msgstr "Intensidade:"
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Suplemento Cue Sheet"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Eliminar ficheiros"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Erro ao mover %s para o lixo: %s"
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Erro ao eliminar %s: %s"
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Erro ao eliminar %s: não é ficheiro local"
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Pretende mover os ficheiros selecionados para o lixo?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Mover para o lixo"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Pretende eliminar permanentemente os ficheiros selecionados?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Eliminar ficheiros selecionados"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Método de eliminação</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover para o lixo em vez de os eliminar"
 
@@ -1151,11 +1169,11 @@ msgstr "Volume:"
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Suplemento FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1170,15 +1188,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Suplemento FileWriter"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Escolha a pasta"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1208,194 +1222,278 @@ msgstr ""
 "Franklin Street, Fifth Floor\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formato de saída:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Guardar no diretório original"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Guardar num diretório personalizado:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Gerar nome de ficheiro de:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Nome de ficheiro original"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Nome de ficheiro original (sem sufixo)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Etiqueta orifinal"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Adicionar número de faixa ao nome do ficheiro"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Geral"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Automático"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11 025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12 000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16 000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22 050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24 000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32 000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44 100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48 000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint estéreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Qualidade do algoritmo:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Frequência de saída:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de dados/compressão:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Qualidade do algoritmo:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Taxa de dados (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Taxa de dados:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Rácio de compressão:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Modo áudio:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Diversos"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr "Modo de áudio:"
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Forçar conformidade ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Qualidade"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Ativar VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Opções VBR:"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Taxa mínima:"
 
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa mínima (kbps):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Taxa máxima:"
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa máxima (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Taxa média:"
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Forçar taxa de dados mínima"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Opções ABR:"
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Taxa média (kbps):"
-
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Qualidade VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forçar taxa de dados mínima"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Omitir cabeçalho Xing VBR"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Parâmetros:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Marcar como copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Parâmetros ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>Etiquetas ID3</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Forçar adição de \"tags\" v2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Apenas \"tags\" v1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Apenas \"tags\" v2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "\"Tags\""
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Qualidade (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Qualidade (0-1):"
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Geral"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "sem perda"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1407,7 +1505,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1415,19 +1513,19 @@ msgstr ""
 "Suplemento GIO\n"
 "Direitos de autor 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Suplemento GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo \"read-and-append\" não suportado"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo inválido de abertura"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1447,32 +1545,10 @@ msgstr ""
 "\n"
 "Licença: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analisador de espetro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Analisador de espetro OpenGL\n"
-"Direitos de autor 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
-"Direitos de autor 2014 William Pitcock\n"
-"\n"
-"Baseado no suplemento XMMS:\n"
-"Direitos de autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson e 4Front Technologies\n"
-"\n"
-"Licença: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME Shortcuts"
@@ -1493,8 +1569,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Número da entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Título"
@@ -1551,8 +1627,8 @@ msgstr "Colunas disponíveis"
 msgid "Displayed columns"
 msgstr "Colunas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Ferramenta de procura"
 
@@ -1580,335 +1656,338 @@ msgstr "Desacoplar"
 msgid "Disable"
 msgstr "Desativar"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Abrir ficheir_os..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Adicionar ficheiros..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Procurar co_leção"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "Definiçõe_s..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "Re_produzir"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Paus_a"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "Pa_rar"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "Segui_nte"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Baral_har"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Baralhar por álbu_m"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Sem avanç_o na lista de reprodução"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Parar após esta fai_xa"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informações da faixa..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "I_r para a faixa..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Definir ponto de repetição _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Definir ponto de repetição _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "Remover pontos de rep_etição"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Por nome do _ficheiro"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Por caminho do fic_heiro"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Por _número de faixa"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Por artista do álbu_m"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Por _data de disponibilização"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Por _género"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Por d_uração"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Por caminho do _ficheiro"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Por título personali_zado"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Inv_erter ordem"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Aleató_rio"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "Re_produzir/Retomar"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Organização"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Organizar se_leção"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Remover _duplicados"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Remover ficheiros indisponívei_s"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nova"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Mud_ar nome..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Gestão da lista de reprodução..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Gestão da fila de reprodução..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "A_umentar volume"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "_Diminuir volume"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Equalizador..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "E_feitos..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "G_ravar emissão"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Definiçõe_s áudio..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menu"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de i_nformações"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar vis_ualização da barra de informações"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Mo_strar barra de estado"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Mostrar tempo _restante"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Visualizações..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "Re_produção"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Lista de reprodução"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "S_aída"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Colocar/retirar da fila"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta respetiva"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Recarregar seleção"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Selecion_ar tudo"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Muda_r nome..."
 
@@ -1949,58 +2028,57 @@ msgstr "Teclas de seta procuram por:"
 msgid "Scroll on song change"
 msgstr "Deslocar ao mudar de faixa"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "A processar..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canais"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Modo simples"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Modo lista de reprodução"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Para após a faixa"
 
@@ -2008,9 +2086,9 @@ msgstr "Para após a faixa"
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Reproduzir"
 
@@ -2018,8 +2096,8 @@ msgstr "Reproduzir"
 msgid "Pause/Resume"
 msgstr "Pausa/Retomar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Parar"
 
@@ -2118,7 +2196,7 @@ msgstr "<b>Associação de teclas:</b>"
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Atalhos globais"
 
@@ -2149,25 +2227,25 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Sistema Jack"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Ligar automaticamente às portas de saída"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Apenas foram encontradas %d portas de saída JACK e são precisas %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falha ao estabelecer ligação à porta %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2175,12 +2253,12 @@ msgstr ""
 "O JACK apenas tem suporte a áudio de vírgula flutuante. Deve alterar a "
 "profundidade para vírgula flutuante nas definições."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 "Falha ao estabelecer ligação ao servidor JACK. O servidor está em execução?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2284,48 +2362,48 @@ msgstr "Nova ligação ao servidor LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Intervalo entre ligações:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Suplemento LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "A letra da faixa não está disponível."
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Erro"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s."
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível processar %s."
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "A procurar letra da faixa..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Detalhes em falta"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Ligação a lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Editar letra da faixa"
 
@@ -2337,17 +2415,17 @@ msgstr "Listas de reprodução M3U"
 msgid "Tact Generator"
 msgstr "Gerador Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2502,15 +2580,15 @@ msgstr "Estas definições serão aplicadas após reiniciar o Audacious."
 msgid "MPG123 Plugin"
 msgstr "Suplemento MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Avançado</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Usar cálculo preciso de duração (lento)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2522,35 +2600,35 @@ msgstr "Servidor MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Suplemento Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro ao redirecionar"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP desconhecido"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Erro ao processar URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Demasiados redirecionamentos"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "O Audacious não está a reproduzir."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificações do ambiente de trabalho"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2587,15 +2665,15 @@ msgstr ""
 "Deve ter recebido uma cópia da GNU General Public License com esta "
 "aplicação.  Se tal não ocorreu consulte <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Mostrar controlos de reprodução"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Mostrar sempre notificação"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Incluir nome do álbum na notificação"
 
@@ -2603,21 +2681,21 @@ msgstr "Incluir nome do álbum na notificação"
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Sistema OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2659,23 +2737,23 @@ msgstr ""
 "Gostaria de agradecer às pessoas em #audacious, especialmente a Tony Vroon, "
 "a John Lindgren e a todos os anteriores autores do suplemento OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Gestor de lista de reprodução"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Mud_ar nome"
 
@@ -2687,34 +2765,33 @@ msgstr "Listas de reprodução PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Sistema PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Suplemento PulseAudio\n"
 "\n"
 "Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo "
 "nos termos da GNU General Public License, tal como publicada pela Free "
-"Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais "
+"Software Foundation, tanto na versão 2 ou (por opção) qualquer versão mais "
 "recente.\n"
 "\n"
 "Este programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI "
@@ -2723,15 +2800,15 @@ msgstr ""
 "para mais detalhes.\n"
 "\n"
 "Deve ter recebido uma cópia da GNU General Public License junto com o "
-"programa. Se tal não aconteceu, escreva uma carta para Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"programa. Se tal não aconteceu, escreva uma carta para:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2745,47 +2822,73 @@ msgstr ""
 "Baseado no suplemento SDL Output\n"
 "Direitos de autor 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analisador de espetro OpenGL\n"
+"Direitos de autor 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
+"Direitos de autor 2014 William Pitcock\n"
+"\n"
+"Baseado no suplemento XMMS:\n"
+"Direitos de autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson e 4Front Technologies\n"
+"\n"
+"Licença: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Execução..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Informações"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Procura"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "A_brir pasta..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Adicionar pasta..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Insp_etor de registos..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Abrir ficheiros"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Adicionar ficheiros"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Baralhar"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "A_brir pasta..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Adicionar pasta..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Insp_etor de registos..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
@@ -2829,7 +2932,7 @@ msgstr "<b>Conversão</b>"
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2881,60 +2984,49 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. A fazer scrobble para o utilizador: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "A verificar o acesso Last.fm..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permissão recusada"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Aceda a esta ligação para permitir que o Audacious faça scrobble das "
-"reproduções:"
+"Os seus 'scrobbles' estão guardados no computador. Serão enviados assim que "
+"o Audacious tiver permissão para o fazer."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Mantenha esta janela aberta e clique novamente em \"Verificar permissões\".\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Permissão concedida. A enviar faixas para o utilizador %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Não se preocupe. Os seus 'scrobbles' estão guardados no computador.\n"
-"Serão enviados assim que o Audacious tiver permissão para o fazer."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Erro na rede"
+"Permissão recusada. Abra o seguinte URL no navegador, permita que o "
+"Audacious tenha acesso à sua conta e clique novamente em 'Verificar "
+"permissão':"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Ocorreu um erro ao contactar com a Last.fm. Por favor tente novamente."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Ocorreu um erro ao contactar com a Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "A verificar..."
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Verificar permissão"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Verific_ar permissão"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Revogar permissão"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar permissão"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Tem de dar permissão ao Audacious para fazer scrobble das faixas para a sua "
-"conta Last.fm.\n"
+"Tem que permitir que o Audacious aceda à sua conta Last.fm para poder fazer "
+"o 'scrobble' das suas faixas."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2966,7 +3058,7 @@ msgstr ""
 "Obrigado ao John Lindgren por me ter ajudado no início deste projeto.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2974,11 +3066,11 @@ msgstr ""
 "O Audacious passou a usar uma nova versão do scrobbler Last.fm.\n"
 "Por favor verifique as definições do suplemento Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Sistema SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2986,58 +3078,58 @@ msgstr ""
 "Suplemento SDL\n"
 "Direitos de autor 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Coleção"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d oculto)"
 msgstr[1] "(%d ocultos)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d faixa"
 msgstr[1] "%d faixas"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "deste género"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "em"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "por"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Criar lista de reprodução"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Adicionar à lista de reprodução"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Procurar coleção"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3045,11 +3137,11 @@ msgstr ""
 "Para importar a coleção de músicas para o Audacious, escolha a pasta e "
 "clique no ícone \"Atualizar\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Aguarde..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Escolha a pasta"
 
@@ -3145,15 +3237,15 @@ msgstr "Limite:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Pontos de repetição removidos"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Ponto de repetição A definido"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Ponto de repetição B definido"
 
@@ -3205,373 +3297,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Equalizador do Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Equilíbrio: %d%% à esquerda"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Equilíbrio: centro"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Equilíbrio: %d%% à direita"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Menu de opções"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Desativar \"Sempre visível\""
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Ativar \"Sempre visível\""
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Caixa de informações de ficheiro"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Tamanho duplo"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualizações"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Gravação ativa"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Gravação inativa"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Aumentar volume"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Reduzir volume"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Efeitos..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Gravar emissão"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Definições áudio..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Abrir ficheiros..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Abrir URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Procurar na coleção"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Reprodução"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Saída"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Serviços"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Sobre..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Definições..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Sair"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Informações da faixa..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Baralhar por álbum"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Sem avanço na lista de reprodução"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Parar após esta faixa"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Definir repetição A-B"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Remover repetição A-B"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Ir para a faixa..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Ir para posição temporal..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Reproduzir/Retomar"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nova lista de reprodução"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Mudar nome da lista de reprodução..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução..."
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Lista de reprodução anterior"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Próxima lista de reprodução"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importar lista de reprodução..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportar lista de reprodução..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Gestão da lista de reprodução..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Gestão da fila de reprodução..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Atualizar lista de reprodução"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Mostrar editor de listas de reprodução"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Mostrar equalizador"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Mostrar tempo restante"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Sempre visível"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Em todas as áreas de trabalho"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Recolher reprodutor"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Recolher editor de listas"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Recolher equalizador"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Adicionar URL..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Adicionar ficheiros..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Por nome de ficheiro"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Por caminho"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Remover tudo"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Limpar fila de reprodução"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Remover ficheiros indisponíveis"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Remover duplicados"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Remover desmarcadas"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Remover seleção"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Procurar e selecionar"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Inverter seleção"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Não selecionar"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Por número de faixa"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Por artista do álbum"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Por data de lançamento"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Por género"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Por duração"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Lista aleatória"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Inverter lista"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Organizar seleção"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Ordenação"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Abrir pasta respetiva"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Colocar/retirar da fila"
 
@@ -3584,15 +3684,15 @@ msgstr "Editor de listas de reprodução"
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Interface clássica Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Abrir pasta..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Adicionar pasta..."
 
@@ -3680,7 +3780,7 @@ msgid "Slow"
 msgstr "Lento"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Normal"
 
@@ -3816,7 +3916,7 @@ msgstr "Criar lista de reprodução com as entradas coincidentes"
 msgid "Sndfile Plugin"
 msgstr "Suplemento Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3857,60 +3957,60 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (vazio para predefinição):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Guardar e restaurar volume:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Erro Sndio: formato áudio não suportado (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Erro Sndio: falha sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Erro Sndio: falha sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Erro Sndio: falha sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Alteração de faixa"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Comandos</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Comando a executar ao inicar uma nova faixa:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Comando a executar ao terminar uma faixa:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando a executar no final de uma lista de reprodução:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Comando a executar ao mudar o título da faixa (para emissões web):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3918,7 +4018,7 @@ msgstr ""
 "Pode utilizar os códigos seguintes, que serão substituídos antes de o "
 "comando ser executado (alguns não serão para um comando de fim de lista):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3944,7 +4044,7 @@ msgstr ""
 "%t: Posição na lista de reprodução\n"
 "%T: Título (não formatado)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3952,15 +4052,15 @@ msgstr ""
 "Os parâmetros enviados à consola devem ser envolvidos em aspas.Os parâmetros "
 "sem aspas podem gerar resultados inesperados."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Informações da faixa"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3974,43 +4074,43 @@ msgstr ""
 "Baseado no suplemento Sample Rate Converter\n"
 "Direitos de autor 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Rápida"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Muito alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e pitch"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Velocidade e pitch</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Pitch:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícone de estado"
 
@@ -4114,12 +4214,12 @@ msgstr "<b>Extra estéreo</b>"
 msgid "Tone Generator"
 msgstr "Gerador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Gerador de tons:"
 
@@ -4143,7 +4243,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4221,7 +4321,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4231,19 +4331,31 @@ msgstr ""
 "Baseado em in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n"
 "Adaptação ao Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Suplemento Win32 waveOut\n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "com perda (híbrido)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "com perda"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4257,14 +4369,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Configuração XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Ignorar duração do ficheiro"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reprodução XML Shareable (XSPF)"
diff --git a/po/ru.po b/po/ru.po
index 10c8431..fcd1320 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,11 +7,11 @@
 # Денис <alpi_bel@mail.ru>, 2014
 # Andrei Stepanov, 2014-2015
 # Someonefree <drag-sasha@mail.ru>, 2013-2014
-# Eugene Paskevich <eugene@raptor.kiev.ua>, 2015
+# Eugene Paskevich <eugene@raptor.kiev.ua>, 2015-2016
 # Ilyas B Arinov <arinov.ilyas@gmail.com>, 2014
 # iavojd <iavojd@gmail.com>, 2013
 # iavojd <iavojd@gmail.com>, 2013
-# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2014-2015
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2014-2016
 # Ilyas B Arinov <arinov.ilyas@gmail.com>, 2015
 # Ilyas B Arinov <arinov.ilyas@gmail.com>, 2015
 # joshuazzz <joshuazzz@yandex.ru>, 2012
@@ -44,9 +44,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2016-02-29 08:16+0000\n"
-"Last-Translator: Volk Daemon <volk-daemon@rambler.ru>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-24 18:43+0000\n"
+"Last-Translator: Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "Language-Team: Russian (http://www.transifex.com/jlindgren/audacious/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -57,7 +57,7 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Декодер AAC(Raw)"
 
@@ -65,20 +65,20 @@ msgstr "Декодер AAC(Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (проигрыватель AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "последовательный"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Будильник"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Установить Будильник ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Изначально написан Adam Feakin и Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -185,147 +185,147 @@ msgstr ""
 "    Введите напоминание в поле ввода и поставьте\n"
 "    галочку, если хотите чтобы оно отображалось."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Это ваш звонок будильника"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Напоминание на сегодняшний день..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Напоминание"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Понедельник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Четверг"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Пятница"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Суббота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Время"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Будильник в (по умолчанию):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "ч"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Перестать звонить после:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "часы"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "минуты"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Выберите дни, в которые будет срабатывать будильник"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "День"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дни"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Плавное нарастание громкости"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунд"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Громкость"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Начать c"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "В конце"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Текущее"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Дополнительная команда"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "включить"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Плейлист (необязательно)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Выберите список воспроизведения"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Параметры"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Что означают эти опции?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Справка"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Обложка альбома"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Вывод ALSA"
 
@@ -367,11 +367,11 @@ msgstr "Микшер:"
 msgid "Mixer element:"
 msgstr "Компонент микшера:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Плагин AMIDI (проигрыватель MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -413,68 +413,68 @@ msgstr ""
 "Tony Vroon\n"
 "за помощь при альфа-тестировании"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Заменить дефолтный усилитель на:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Изменить полифонию по умолчанию:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Заменить ревербацию по умолчанию на:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "На"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Заменить хор по умолчанию на:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Воспроизведение</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Транспонирование: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "полутона"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Смещение ударных: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "номера нот"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Пропускать тишину"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Пропускать тишину в конце"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>Шрифт</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Синтезатор</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Частота дискретизации:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -482,86 +482,106 @@ msgstr "Частота дискретизации:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - выбор SoundFont файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "Закончить"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Открыть"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Размер (байт)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\">Информация MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Длительность (мс):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Количество дорожек:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "переменный"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\">Комментарии и тексты MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет комментариев *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет текстов *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "Закрыть"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (неверный UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Браузер Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Браузер Ampache\n"
+"\n"
+"Клиент Ampache для Audacious.\n"
+"\n"
+"Лицензия: GNU GPLv3\n"
+"Права защищены (C) Róbert Čerňanský и John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -580,7 +600,7 @@ msgstr ""
 "В основе библиотека Ghosd Evan Martin'а:\n"
 " http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (всплывающие сообщения)"
 
@@ -634,94 +654,94 @@ msgstr "Пауза выкл."
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показать OSD, когда воспроизведение возобновляется."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Расположение"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Смещение по оси X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Смещение по оси Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Максимальная ширина OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Параметры для систем с несколькими мониторами"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Показать OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "на всех мониторах"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "на мониторе %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Время (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "отображения:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "появления:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "затухания:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Тень"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Стиль отображения"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Цвет %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Включить событие"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Событие"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Найден композитный менеджер"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -731,61 +751,57 @@ msgstr ""
 "Пожалуйста, запустите композитный менеджер; в противном случае\n"
 "OSD не будет работать корректно."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Прозрачность"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Имитированная прозрачность"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Настоящая прозрачность (требуется расширение X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Расширение X Composite не загружено"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Расширение X Composite недоступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Положение"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "События"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Тест"
 
@@ -801,11 +817,11 @@ msgstr "Списки воспроизведения ASXv1/ASXv2"
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки воспроизведения Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Цвет</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Размывающийся уровень"
 
@@ -829,15 +845,15 @@ msgstr "x1/10 дБ"
 msgid "Cut frequency:"
 msgstr "Частота среза:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Модуль Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -861,118 +877,118 @@ msgstr ""
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Устройство</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Скорость чтения:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Переопределить устройство:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метаданные</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Использовать CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Использовать CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Использовать HTTP вместо CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Пусть:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Ошибка при инициализации CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Некорректный URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Трек %d не найден."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Дорожка %d это данные дорожки."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Ошибка чтения аудио CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не удалось открыть устройство CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Не найдено совместимого CD-устройства."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Ошибка при инициализации CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Failed to retrieve first/last track number."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Невозможно считать начало/конец LSN для трека %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Не удалось создать cddb соеденения."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Не удалось выполнить запрос к базе CDDB сервера"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Не удалось выполнить запрос к базе CDDB сервера: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Не удалось прочитать cddb информацию: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Привод пуст."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Неподдерживаемый тип диска."
 
@@ -1143,58 +1159,60 @@ msgstr "Интенсивность:"
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Модуль Cue листов"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Удалить файлы"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Ошибка при перемещении %s в корзину: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "ошибка удаления %s: %s"
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Ошибка удаления %s: это не локальный файл."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Вы хотите удалить  выбранные файлы в корзину?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Удалить в Корзину"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Вы хотите удалить без восстановления выбранные файлы”?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Удалить выбранный файлы"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Метод Удаления</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Перемещать в корзину вместо немедленного удаления"
 
@@ -1236,11 +1254,11 @@ msgstr "Громкость:"
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Модуль FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1256,15 +1274,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Модуль записи в файл"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Выбор каталога"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1293,194 +1307,278 @@ msgstr ""
 "этой программой; если нет, напишите в Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, США."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Формат записываемого файла:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Сохранить в тот же каталог"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Сохранить в другой каталог:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Создавать имя файла из:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Исходное имя файла"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Исходное имя файла (без суффикса)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Метка исходного файла"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Добавить в начало названия файла номер дорожки"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Основной"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Автоматически"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Гц"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Гц"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Гц"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Гц"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Гц"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Гц"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Гц"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Гц"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Гц"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 кбит/с"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 кбит/с"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 кбит/с"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 кбит/с"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 кбит/с"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 кбит/с"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 кбит/с"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 кбит/с"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 кбит/с"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 кбит/с"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 кбит/с"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 кбит/с"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 кбит/с"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 кбит/с"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 кбит/с"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 кбит/с"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Объединённое стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Качество алгоритма:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Частота дискретизации на выходе:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Гц)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Качество звука и степень сжатия:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "Качество алгоритма:"
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Битрейт (кб/с)"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Битрейт:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Степень сжатия:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Аудио режим:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Прочее:"
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Строгое соответствие ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Защита от ошибок"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Качество"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Включить VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Параметры VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Минимальный битрейт (кб/с):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимальный битрейт (кб/с):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строгое соблюдение минимального битрейта"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "Минимальный битрейт:"
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Параметры ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "Максимальный битрейт:"
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Средний битрейт (кбит/с):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "Средний битрейт:"
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Уровень качества VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строгое соблюдение минимального битрейта"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Пропускать заголовок Xing VBR"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Параметры кадра:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>Заголовки кадра</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Пометить как защищённое авторским правом"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Пометить как оригинальное"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "Параметры ID3:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 Теги</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Принудительное добавление тегов 2-й версии"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Только 1-я версия тегов"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Только 2-я версия тегов"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Качество"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Теги"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Уровень качества (0 – 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "Качество (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Основной"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1492,7 +1590,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1500,19 +1598,19 @@ msgstr ""
 "Модуль GIO для Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Модуль GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Режим Чтение-и-добавление не поддерживается"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Недопустимый метод открытия"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1532,32 +1630,10 @@ msgstr ""
 "\n"
 "Лицензия: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Спектральный Анализатор"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Анализатор спектра OpenGL для Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Основан на плагине для XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"Лицензия: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Горячие клавиши GNOME"
@@ -1578,8 +1654,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Номер записи"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Название"
@@ -1636,8 +1712,8 @@ msgstr "Доступные колонки"
 msgid "Displayed columns"
 msgstr "Показанные колонки"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Поиск"
 
@@ -1665,335 +1741,338 @@ msgstr "Открепить"
 msgid "Disable"
 msgstr "Отключить"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Открыть файлы ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Открыть _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Добавить файлы ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Добавить U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Поиск в библиотеке"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "О_ программе ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Настройки"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Пауз_а"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Стоп"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Пре_дыдущий"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Следующий"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Повтор"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "В_разброс"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "В_разброс по альбомам"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Н_е передвигаться по списку"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Остановка после этой песни"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Информация о _песне"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Перейти ко _времени ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_Перейти к песне ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Повтор установки _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Повтор установки _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Повтор чистых пунктов"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "По _названию"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "По _имени файла"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Путь к файлу"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "По _номеру трека"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "По _исполнителю"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "По Альбому"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "По исполнителю"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "По _дате выпуска"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "По _жанру"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "По _Длинне"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "По расположению _файла"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "По _заданному названию файла"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "В _обратном порядке"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "В _случайном порядке"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Воспроизвести/продолжить"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "Обновить"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Сортировать"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Сортировать выбранные"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Удалить _дубликаты"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Убрать _недоступные файлы"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Новый"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Пере_именовать"
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Убрать"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Импортировать ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Экспортировать ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "_Управление списками..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_Управление очередью ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Увеличить громкость"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Уменьшить громкость"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Эквалайзер ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Э_ффекты"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Запись потока"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Настрой_ки аудио ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Показывать _панель меню"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Показывать п_анель информации"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Показывать инфо. визуализации"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Показывать _строку состояния"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Показать _оставшееся время"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Визуализация..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "С_писок"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Службы"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Вывод"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Вид"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Элемент очереди"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Открыть расположение файла"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "_Обновить выбранное"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Вырезать"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "Вставить в _конец"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Выбрать _всё"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Пере_именовать..."
 
@@ -2034,33 +2113,32 @@ msgstr "Поиск стрелками:"
 msgid "Scroll on song change"
 msgstr "Прокручивать при смене песни"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Интерфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Буферизация ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2069,25 +2147,25 @@ msgstr[1] "%d канала"
 msgstr[2] "%d каналов"
 msgstr[3] "%d каналов"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d кГц"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/с"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Одиночный режим"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Режим списка воспроизведения"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Остановить после дорожки"
 
@@ -2095,9 +2173,9 @@ msgstr "Остановить после дорожки"
 msgid "Previous track"
 msgstr "Предыдущая дорожка"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Воспроизвести"
 
@@ -2105,8 +2183,8 @@ msgstr "Воспроизвести"
 msgid "Pause/Resume"
 msgstr "Пауза/Продолжить"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Остановить"
 
@@ -2206,7 +2284,7 @@ msgstr "<b>Привязка клавиш:</b>"
 msgid "_Add"
 msgstr "Добавить"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Глобальные горячие клавиши"
 
@@ -2237,25 +2315,25 @@ msgstr ""
 "Jonathan A. Davis <davis@jdhouse.org>,\n"
 "Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Вывод JACK"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Автоматически подключаться к портам вывода"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Обнаружены только выходные разъёмы %d JACK, но требуется %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Ошибка подключения к разъёму JACK %s."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2263,11 +2341,11 @@ msgstr ""
 "JACK поддерживает только аудио с плавающей точкой. Вы должны изменить "
 "выходную битовую глубину на режим с плавающей точкой в настройках Audacious."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Сбой подключения к серверу JACK; он работает?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2371,48 +2449,48 @@ msgstr "Переподключиться к LIRC серверу"
 msgid "Wait before reconnecting:"
 msgstr "Ждать перед переподключением:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Модуль LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Текст песни недоступен"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не удалось получить %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не удалось проанализировать %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Поиск текста песни ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Метаданные песни отсутствуют"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Устанавливаю соединение с lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Редактировать текст песни ..."
 
@@ -2424,17 +2502,17 @@ msgstr "Списки воспроизведения M3U"
 msgid "Tact Generator"
 msgstr "Генератор тактов"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактовый генератор: %d тактов/с"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактовый генератор: %d уд/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2589,15 +2667,15 @@ msgstr "Настройки вступят в силу после перезап�
 msgid "MPG123 Plugin"
 msgstr "Модуль MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Расширенные</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Использовать аккуратное вычисление длины (медленно)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Объёмное звучание"
 
@@ -2609,35 +2687,35 @@ msgstr "Сервер MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Модуль HTTP/HTTPS Neon"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Ошибка парсинга перенаправлений"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Неизвестная ошибка HTTP"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Ошибка парсинга URL"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Слишком много перенаправлений"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious ничего не воспроизводит."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Всплывающие сообщения"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2668,15 +2746,15 @@ msgstr ""
 "Вы должны были получить копию Общей Общественной Лицензии GNU вместе с этой "
 "программой. Если нет, смотрите <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Показать кнопки управления воспроизведением"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Всегда показывать уведомления"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Включить название альбома в уведомление"
 
@@ -2684,21 +2762,21 @@ msgstr "Включить название альбома в уведомлени
 msgid "Show"
 msgstr "Показать"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Следующая дорожка"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "Вывод OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "Выход OSS3"
 
@@ -2740,23 +2818,23 @@ msgstr ""
 "Я хочу поблагодарить людей из #audacious, особенно Тони Vroon и John "
 "Lindgren, и, конечно же, авторов предыдущего модуля OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Списки воспроизведения"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Элементы"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "Пере_именовать"
 
@@ -2768,28 +2846,27 @@ msgstr "Списки воспроизведения PLS"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Вывод PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Модуль вывода PulseAudio для Audacious\n"
 "\n"
@@ -2806,11 +2883,11 @@ msgstr ""
 "этой программой; если нет, напишите в Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, США."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Выход QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2824,47 +2901,73 @@ msgstr ""
 "Основан на плагине SDL Output для Audacious\n"
 "Права защищены 2010 Джон Линдгрэн"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Анализатор спектра OpenGL для Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Основан на плагине для XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Лицензия: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Работаю ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "Информация"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Поиск"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Oткрыть папку ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Добавить папку ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "_Инспектор журнала ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Открыть файлы"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Добавить файлы"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Предыдущая дорожка"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Повтор"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Вразброс"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Oткрыть папку ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Добавить папку ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "_Инспектор журнала ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Интерфейс Qt"
 
@@ -2908,7 +3011,7 @@ msgstr "<b>Преобразование</b>"
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Частота:"
 
@@ -2960,61 +3063,48 @@ msgstr "176.4 кГц:"
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Прослушивание для пользователя: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Отказано в доступе"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "Проверяется доступ к Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Воспользуйтесь следующей ссылкой чтобы разрешить Audacious отправлять "
-"прослушанные композиции на Last.fm:"
+"Список Ваших прослушиваний временно сохраняется на Вашем компьютере. Он "
+"будет доставлен на Last.fm, как только Audacious получит доступ."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Оставте это окно открытым и нажмите кнопку \" Запросить разрешение' снова.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "Доступ получен. Пользователь %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не беспокойтесь, список ваших прослушиваний сохраняется на компьютере.\n"
-"Он будет доставлен на Last.fm, как только Audacious получит разрешение это "
-"сделать."
+"В доступе отказано. Откройте ссылку ниже в Вашем браузере, предоставьте "
+"доступ для Audacious, а затем нажмите \"Проверить доступ\" еще раз:"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблемы с сетью"
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "Не удалось подключиться к Last.fm."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Невозможно подключится к Last.fm. Попробуйте повторить позже"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "Проверить доступ"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверка..."
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "Отменить доступ"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "З_апросить разрешение"
-
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Отменить разрешение"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 "Вы должны разрешить Audacious отправлять прослушанные дорожки в ваш аккаунт "
-"Last.fm\n"
+"Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3044,7 +3134,7 @@ msgstr ""
 "\n"
 "Спасибо John Lindgren за оказание помощи в начале этого проекта.\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3053,11 +3143,11 @@ msgstr ""
 "Scrobbler.\n"
 "Пожалуйста, проверьте настройки модуля Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Вывод SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3065,13 +3155,13 @@ msgstr ""
 "Модуль вывода SDL для Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -3080,7 +3170,7 @@ msgstr[1] "%d результатов"
 msgstr[2] "%d результатов"
 msgstr[3] "%d результатов"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -3089,7 +3179,7 @@ msgstr[1] "(%d скрыто)"
 msgstr[2] "(%d скрыто)"
 msgstr[3] "(%d скрыто)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3098,31 +3188,31 @@ msgstr[1] "%d песен"
 msgstr[2] "%d песен"
 msgstr[3] "%d песен"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "этого жанра"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "на"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "от"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Создать список воспроизведения"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Добавить в список воспроизведения"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Поиск в библиотеке"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3130,11 +3220,11 @@ msgstr ""
 "Для импорта музыки в библиотеку Audacious выберите каталог, затем нажмите "
 "иконку \"обновить\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Пожалуйста, подождите ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Выберите каталог"
 
@@ -3230,15 +3320,15 @@ msgstr "Примесь:"
 msgid "dB"
 msgstr "дБ"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Повторить очищенные пункты"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Повторить установки A"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Повторить установки B"
 
@@ -3290,373 +3380,381 @@ msgstr "16 кГц"
 msgid "Audacious Equalizer"
 msgstr "Эквалайзер Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Переход к %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Громкость: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% влево"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Баланс: по центру"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% вправо"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Меню параметров"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Отключить \"Поверх всех окон\""
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Включить \"Поверх всех окон\""
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Информация о файле"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Двойной размер"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Зрительные образы"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Запись включена"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Запись выключена"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Громкость вверх"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Громкость вниз"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Эффекты ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Запись потока"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Настройки аудио ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Открыть файлы..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Открыть URL..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Плейлист"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Вывод"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Вид"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Службы"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "О..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "настройки ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Выход"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Информация о песне"
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Вразброс по альбомам"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Без движения по списку воспроизведения"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Остановить после этой песни"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Установить A-B повтор"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Удалить A-B повтор"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Перейти к песне ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Перейти ко времени ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Воспроизвести/продолжить"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Новый список воспроизведения"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Переименовать список"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Удалить плейлист"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Предыдущий список"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Следующий список"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Импортировать список воспроизведения"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Экспортировать список воспроизведения"
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Управление списками..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Управление очередью ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Обновить список воспроизведения"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Отобразить редактор списка воспроизведения"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Отобразить эквалайзер"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Показать оставшееся время"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Поверх всех окон"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "На всех рабочих столах"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Свернуть проигрыватель"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Свернуть редактор списка воспроизведения"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Свернуть эквалайзер"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Добавить URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Добавить файлы..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "По названию"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "По имени файла"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "По расположению _файла"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Удалить все"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Очистить очередь"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Удалить недоступные файлы"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Удалить дубликаты"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Удалить не отмеченные"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Найти и выбрать"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Инвертировать выбор"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Снять выделение"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "По номеру дорожки"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "По исполнителю"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "По альбому"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "По исполнителю"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "По _дате выпуска"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "По жанру"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "По длительности"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "По _заданному названию файла"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Сортировать в случайном порядке"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "В обратном порядке"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Сортировать выбранные"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Сортировать список"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "Открыть директорию"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "Вставить в конец"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "В очередь/Из очереди"
 
@@ -3669,15 +3767,15 @@ msgstr "Редактор списков воспроизведения Audacious
 msgid "%s (%d of %d)"
 msgstr "%s (%d из %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Интерфейс классического Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Oткрыть папку ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Добавить папку ..."
 
@@ -3765,7 +3863,7 @@ msgid "Slow"
 msgstr "Медленно"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Средне"
 
@@ -3901,7 +3999,7 @@ msgstr "Создать новый список воспроизведения с
 msgid "Sndfile Plugin"
 msgstr "Модуль Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3941,62 +4039,62 @@ msgstr ""
 "программой; если этого не произошло, напишите во Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Выход Sndio"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Устройство (по-умолчанию - оставить пустым):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Сохранять и восстанавливать уровень:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Ошибка Sndio: Неподдерживаемый звуковой формат (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Ошибка sndio: sio_open() сбой"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Ошибка sndio: sio_setpar() сбой"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Ошибка sndio: sio_start() сбой"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Смена дорожки"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Команды</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Команда для выполнения после начала воспроизведения новой композиции:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Команда выполняемая после окончания композиции:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Команда выполняемая после окончания списка воспроизведения:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Команда для выполнения при изменении названия композиции (для "
 "воспроизведения по сети):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -4004,7 +4102,7 @@ msgstr ""
 "Вы можете использовать следующие коды формата, которые будут заменены перед "
 "запуском команды (не все полезно для команды конца-воспроизведения)"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -4031,7 +4129,7 @@ msgstr ""
 "%t: позиция в списке воспроизведения\n"
 "%T: Название (неформатированный)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -4039,15 +4137,15 @@ msgstr ""
 "Параметры, передаваемые оболочке, должны быть заключены в кавычки. "
 "Некотируемые параметры могут привести к неожиданным результатам."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Информация о песне"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Ресемплер"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4061,43 +4159,43 @@ msgstr ""
 "Основан на модуле преобразования частоты дискретизации:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Быстро"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Низкое"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Высокое"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Очень высокое"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Скорость и высота"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Скорость и высота</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Скорость:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Высота:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Иконка статуса"
 
@@ -4202,12 +4300,12 @@ msgstr "<b>Расширенное стерео</b>"
 msgid "Tone Generator"
 msgstr "Генератор тона"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
@@ -4230,7 +4328,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Удаление вокала"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4307,7 +4405,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4317,19 +4415,31 @@ msgstr ""
 "Основан на коде in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
 "Модуль для Audacious от Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin для Audacious\n"
+"Права защищены 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "lossy (hybrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4343,32 +4453,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>Настройки XSF</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Не придавать значение длительности из файла"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XSPF"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другое "
-#~ "количество каналов.  Вы можете использовать микшер каналов, чтобы "
-#~ "конвертировать песню в то же количество каналов."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другую частоту "
-#~ "дискретизации. Вы можете использовать конвертер частоты дискретизации для "
-#~ "конвертирования песни в ту же частоту."
diff --git a/po/si.po b/po/si.po
index a9b2971..70ab942 100644
--- a/po/si.po
+++ b/po/si.po
@@ -11,10 +11,10 @@
 # P.I.Balasinghe <pushpika.indrachapa@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Sinhala (http://www.transifex.com/jlindgren/audacious/"
 "language/si/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -32,20 +32,20 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "Adකෙවෙනිය (AdLib ධාවකය)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "අනුපිළිවෙළ"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "සිහි කැඳවීම​"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -55,7 +55,7 @@ msgstr ""
 "⏎\n"
 "මුලින් ලියන ලද්දේ ඇඩම් ෆීකින් සහ ඩැනියෙල් ස්ටොඩ්ඩන් විසිනි."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -106,147 +106,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "මේ ඔබගේ සිහි කැඳවීමේ ඇමතුමයි."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "ඔබගේ අද දවසේ මතක් කිරීම වන්නේ..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "මතක් කිරීම​"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "සඳුදා"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "අඟහරුවාදා"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "බදාදා"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "බ්‍රහස්පතින්දා"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "සිකුරාදා"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "සෙනසුරාදා"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "ඉරිදා"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "වෙලාව​"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "සිහිකැඳවීම​ (පෙරනිමිය​)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "පැ"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "පසු නිහඬවන්න:​"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "පැය​"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "මිනිත්තු"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "සිහි කැඳවීම් ලැබිය යුතු දිනයන් තෝරන්න​"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "දවස​"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "පෙරනිමිය​"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "දවස්"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "හායනය"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "තප්පර​"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "ශබ්ද මට්ටම​"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "ආරම්භ කරන්න​"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "අවසානය​"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "දැන්"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "අමතර විධාන​"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "සක්‍රීය​"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "ධාවනය වන ගොනුව (අමතර​)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "ධාවන ලැයිස්තුවක්​ තෝරන්න"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "විකල්ප​"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "මොනවාද මේ විකල්පයන්ගෙන් අදහස් වන්නේ?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "උදව්"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "ඇල්බම් කලාව"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA ප්‍රතිදානය "
 
@@ -287,11 +287,11 @@ msgstr "මිශ්‍ර කිරීමේ ආම්පන්නය:"
 msgid "Mixer element:"
 msgstr "මිශ්‍ර කිරීමේ මූලද්‍රව්‍ය:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-කෙවෙනිය (MIDI ධාවකය)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -314,68 +314,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -383,86 +383,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "හර්ට්ස්"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-පේනු - SoundFont ගොනුව තෝරන්න​"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_අවලංගු කරන්න​"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "ගොනු නම​"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "ප්‍රමාණය (බයිට්ස්)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "නම​:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI තොරතුරු </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "හැඩතලය​:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "දිග (මිලි තප්පර​):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "ඛණ්ඩ ගණන:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "විචල්‍යය"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "කාලය​ බෙදීම​:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI අදහස් දැක්වීම් සහ පද රචනයන් </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* මෙම MIDI ගොනුවෙහි අදහස් දැක්වීම් නොමැත​ *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* මෙම MIDI ගොනුවෙහි පද රචනා නොමැත​ *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_වසන්න​"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(අවලංගු UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -474,7 +488,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (තිරය මත සංදර්ශනය)"
 
@@ -526,94 +540,94 @@ msgstr "විරාමය ක්‍රියාවිරහිතයි"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "පිළිවැයීම් විරාමය අවසානයේදී OSD ක්‍රියාත්මක කිරීම​"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "ස්ථාපනය"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "සාපේක්ෂ X අනුලම්බය:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "සාපේක්ෂ Y අනුලම්බය:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "උපරිම OSD පළල:​"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "බහු මොනිටර විකල්ප​"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD දර්ශනයට​ භාවිතා කරන්න​:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "සියලුම මොනිටර​"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "මොනිටර​ය​ %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "කාල නියමය (මිලි තප්පර​)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "දර්ශනය​:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "ක්‍රමෝද්දීපනය:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "ක්‍රමාවදීපනය:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "අකුරු වර්ගය​"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "අකුරු වර්ගය ​%i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "සෙවනැල්ල​"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "විදැහුම් අන්දම"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "පාට​"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "පාට​ %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "ක්‍රියාරම්භකය සක්‍රිය කිරිම"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "සිද්ධිය​"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "සංයුක්ත කළමනාකාරකය හඳුනා ගන්නා ලදී"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -623,60 +637,56 @@ msgstr ""
 "දැනටමත් එකක් ධාවනය වෙමින් නොපවතී නම් කරුණාකර සංයුක්ත කළමනාකාරකයක් සක්‍රීය කරන්න​. එසේ නැතිනම් "
 "OSD නිසි ලෙස ක්‍රියා නොකරයි"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "ව්‍යාජ විනිවිද පෙනීම සඳහා සංයුක්ත කළමනාකාරකය අවශ්‍ය නැත​"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "විනිවිද පෙනීම"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "ව්‍යාජ විනිවිද පෙනීම​"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "සත්‍ය විනිවිද පෙනීම​ (X සංයුක්ත Ext. අවශ්‍යයයි)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "සංයුක්ත දිගුව​ ප්‍රවේශනය වී නොමැත​"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "සංයුක්ත දිගුව​ නොමැත​"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "පිහිටීම​"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "සජීවනය​"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "පෙළ​"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "අලංකරණය"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "ක්‍රියාරම්භකය"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "විවිධ"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -692,11 +702,11 @@ msgstr "ASXv1/ASXv2 ධාවන ලැයිස්තුව "
 msgid "Audacious Playlists (audpl)"
 msgstr "ඔඩෙෂස් ධාවන ලැස්තු (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>වර්ණ</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "නොපැහැදිලි විෂය පථය"
 
@@ -720,15 +730,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "සංඛ්‍යාතය කපන්න:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "වර්ණාවලි විශ්ලේශකය"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "ශ්‍රව්‍ය CD පේනු මෘදුකාංගය "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,118 +755,118 @@ msgstr ""
 "උපදෙස් දීම සහ මගපෙන්වීම වෙනුවෙන් මගේ ස්තුතිය Tony Vroon වෙත පුද කරමි.\n"
 "මෙය 2007 වසරේ  Google Summer of Code ව්‍යාපෘතියකි."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>ආම්පන්නය</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "වේගයෙන් කියවන්න:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "ප්‍රතික්ෂේපිත ආම්පන්නය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>පාරදත්ත</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "භාවිතා කරන්න CD-පෙළ "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "භාවිතා කරන්න CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP වෙනුවට HTTP භාවිතා කරන්න​"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "සේවාදායකය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "පථය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "තොට:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio උප පද්ධතිය ඇරඹීම අසාර්ථකය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "අවලංගු  URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "ඛණ්ඩය %d සොයාගත නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "ඛණ්ඩ %d දත්ත ඛණ්ඩයකි."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "ශ්‍රව්‍ය CD කියවීමේ දෝෂය"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "ශ්‍රව්‍ය CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "CD අම්පන්නය  %s විවෘත කිරීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "ශ්‍රව්‍ය ක්‍රියා කල හැකි CD අම්පන්නය සොයාගත නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "විවෘත කරන ලද CD අම්පන්නය අවසානය තෙක් ක්‍රියාත්මක කිරීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "පළමු/අවසාන ඛණ්ඩ අංකය සොයාගැනීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "ඛණ්ඩ  %d හි පළමු/අවසාන LSN කියවීමට නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "cddb සම්බන්ධතාව තැනීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "CDDB සේවාදායකය විමසුමට අපොහොසත් විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB සේවාදායකය : %s විමසුමට අපොහොසත් විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "cddb තොරතුරු:  %s කියවීමට අපොහොසත් විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "ධාවකය හිස්."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "සහාය නොමැති තැටි වර්ගයකි."
 
@@ -1015,58 +1025,60 @@ msgstr "තීව්‍රතාව:"
 msgid "Crystalizer"
 msgstr "පළිඟුව"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "සලකුණු පත් පේනු මෘදුකාංගය "
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "මකන්න "
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "අවලංගු කිරීම​"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1104,11 +1116,11 @@ msgstr "ශබ්ද මට්ටම​ :"
 msgid "Echo"
 msgstr "ප්‍රතිරාව"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg පේනු මෘදුකාංගය "
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1124,15 +1136,11 @@ msgstr ""
 "විලියම් පිට්කොක් <nenolod@nenolod.net>⏎\n"
 "මැටී හැමලේයිනෙන් <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "ගොනු රචක පේනු මෘදුකාංගය "
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "ෆෝල්ඩරයක්​ තෝරන්න​"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1149,194 +1157,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "ප්‍රතිදාන ගොනු ආකෘතිය:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "මූලික නාමාවලියට සුරකින්න​"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "සාමාන්‍ය"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "ස්වයංක්‍රීය​"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "එකතු වූ ත්‍රිමාණ​"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "ත‍්‍ර‍්‍රිමාණ "
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "තනි "
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "ඇල්ගොරිතම තත්ත්වය:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(හර්ට්ස්)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "බිට් රේටය (තප්පරයට කි.බ​.)"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "සම්පීඩක අනුපාතය​:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "ශ්‍රව්‍ය​ ප්‍රකාරය​:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "දෝෂ ආරක්‍ෂාව​"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "ප්‍රශස්තතාව"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR සක්‍රිය කරන්න​"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "වර්ගය​:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR විකල්ප​:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "අවම බිට් රේටය (තප්පරයට කි.බ​.)"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "උපරිම​ බිට් රේටය (තප්පරයට කි.බ​.)"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "අවම බිට් රේටය සඳහා තදින් බලකරන්න​"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR විකල්ප​:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "සාමාන්‍ය බිට් රේටය (තත්පරයට කි.බ​.)"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR ප්‍රශස්තතා මට්ටම​:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "අවම බිට් රේටය සඳහා තදින් බලකරන්න​"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "ප්‍රකාශන අයිතිය සහිත ලෙස සලකුණු කරන්න"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "මුල් පිටපතක් ලෙස සලකුණු කරන්න​"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "2 වන සංස්කරණයේ සම්බන්ධකයට​ බලෙන් ඇතුලත් කිරීම​"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "1 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න​"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "2 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න​"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "ප්‍රශස්තතාව"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "සම්බන්ධක"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "ප්‍රශස්ථතා මට්ටම​ (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "සාමාන්‍ය"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC විකේතකය"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "හානි වී නොමැති "
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1348,7 +1440,7 @@ msgstr ""
 "⏎\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1356,19 +1448,19 @@ msgstr ""
 "Audacious සඳහා වන​ GIO පේනු මෘදුකාංගය⏎\n"
 "ප්‍රකාශන අයිතිය 2009-2012 ජෝන් ලින්ඩ්ග්‍රෙන්"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO පේනු මෘදුකාංගය "
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1380,23 +1472,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL වර්ණාවලි විශ්ලේශකය"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1413,8 +1492,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "ඇතුලත් කිරීමේ අංකය​"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "මාතෘකාව"
@@ -1471,8 +1550,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "සෙවීමේ මෙවලම "
 
@@ -1500,335 +1579,338 @@ msgstr "ඈඳීම​ අවලංගු කරන්න​"
 msgid "Disable"
 msgstr "අක්‍රීය කරන්න​"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_ගොනු විවෘත කරන්න ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "_URL විවෘත කරන්න ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_ගොනු එකතු කරන්න ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL එකතු කරන්න ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "පි_ළිබඳ​ ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_පිටවෙන්න​"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_ධාවනය කරන්න​"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "විරාම_ය​"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_නවත්වන්න​"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "ක_ලින්"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_ඊළඟ​"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_නැවත​ ධාවනය​"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "ක_ළවම් කිරීම​"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "ධාවන ලැස්තු නැ_ත "
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "මෙම ගීතයෙන් පසු නවත්තන්න "
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "ගීත_තොරතුරු ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "මගහැර වේලාවට_පිවිසෙන්න ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "_මගහැර ගීතයට පිවිසෙන්න ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "නැවත සිදුවන ස්ථාන_A පිහිටුවන්න "
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "නැවත සිදුවන ස්ථාන_B පිහිටුවන්න "
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "නැවත සිදුවන ස්ථාන හිස්කරන්න "
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "මාතෘකා_වෙන්"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "ගොනු පථයෙන් "
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "ඛණ්ඩ_අංකයෙන් "
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "ශිල්පියා_ගෙන්"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "ඇල්බමයෙන් "
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "පිට කල _දිනයෙන්"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "දුරෙන් "
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "ගොනු_පථයෙන්"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "අභිරුචි_මාතෘකාවෙන් "
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "අග_සිට මුලට​"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_සසම්භාවී පිළිවෙල​"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_නැවුම් කරන්න​"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_අනුපිළිවෙලට සකසන්න​"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "අනුපිටපත්_ඉවත් කිරීම "
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "අනුපයෝජ්‍ය_ගොනු ඉවත් කරන්න"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_නව​"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Ren_ame ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_ආයාත කරන්න​ ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_නිර්යාත කරන්න ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "ධාවන ලැයිස්තු_කළමනාකාරකය​ ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_පෙළගැස්ම කළමනාකරණය ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "ශබ්ද මට්ටම​ _වැඩි කරන්න"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "ශබ්ද මට්ටම​ _අඩු කරන්න"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_මෙනු තීරුව පෙන්වන්න​"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "තොරතුරු තී_රුව පෙන්වන්න​"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "තොරතුරු තීරුවේ දෘෂ්ටි කල්පනය පෙන්වන්න "
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "තත්ව _තීරුව පෙන්වන්න​"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "ඉතුරුවී ඇති කාලය පෙන්වන්න."
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_ගොනුව​"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_පිළිවැයුම​"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "ධා_වන ලැයිස්තුව​"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_සේවා"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_ප්‍රතිදාන​"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_දසුන​"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_පෙළගස්වන්න​/පෙළගැස්ම අවලංගු කරන්න​"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "කපන්_න​"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_පිටපත් කරන්න​"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_අලවන්න​"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "සියල්ල_තෝරන්න"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_නැවත නම් කිරීම​ ..."
 
@@ -1869,58 +1951,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK අතුරු මුහුණත"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "අන්තරාචයනය..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "ඔඩෙෂස් "
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr " තනි "
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "ත්‍රිමාන "
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d නාලිකාව "
 msgstr[1] "%d නාලිකා "
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d තත්පරයට කිලෝ බයිට් "
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "තනි ප්‍රකාරය."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "ධාවන ලැස්තු ප්‍රකාරය."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "ගීතයකින් පසු නැවතීම."
 
@@ -1928,9 +2009,9 @@ msgstr "ගීතයකින් පසු නැවතීම."
 msgid "Previous track"
 msgstr "පෙර ඛණ්ඩය"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "ධාවනය කරන්න "
 
@@ -1938,8 +2019,8 @@ msgstr "ධාවනය කරන්න "
 msgid "Pause/Resume"
 msgstr "නැවතීම/නැවත ඇරඹීම  "
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "නැවතීම "
 
@@ -2037,7 +2118,7 @@ msgstr "<b>යතුරු බැඳීම:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "ගෝලීය විශේෂ බොත්තම්:"
 
@@ -2067,35 +2148,35 @@ msgstr ""
 "ජොනතන් ඒ. ඩේවිස් <davis@jdhouse.org>,\n"
 "ජෙරමි ටෑන් <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK ප්‍රතිදානය"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2195,48 +2276,48 @@ msgstr "සේවාදායකයට ප්‍රතිසම්බන්ධ �
 msgid "Wait before reconnecting:"
 msgstr "ප්‍රතිසම්බන්ධ වීමට පෙර මදක් සිටින්න:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "ලිරික් විකී  පේනු මෘදුකාංගය"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "පද රචනා නොමැත​"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "දෝෂය "
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "කැඳවාගෙන යා නොහැක​ %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "parse කළ නොහැක​ %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "පද රචනා සොයමින් පවතී ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "ගීතයේ metadata නොමැත​"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "lyrics.wikia.com වෙත​ සම්බන්ද වෙමින් පවතී ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2248,17 +2329,17 @@ msgstr "M3U ධාවන ලැයිස්තුව​"
 msgid "Tact Generator"
 msgstr "ටැක්ට් ජනකය"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස් "
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස්  %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2413,15 +2494,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123  පේනු මෘදුකාංගය"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "සිසාළ "
 
@@ -2433,35 +2514,35 @@ msgstr "MPRIS 2 සේවාදායකය"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "නිඕන් HTTP/HTTPS පේනු මෘදුකාංගය"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "නැවතුන "
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "ඔඩෙෂස්  ක්‍රියාත්මක නොවේ."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "වැඩතලය දැනුම් දීම "
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2495,15 +2576,15 @@ msgstr ""
 "ඔබට මම මෘදුකාංගය සමග GNU පොදු  මහජන වරපතේ පිටපතක් ලැබී තිබිය යුතුය, එසේ නොමැති නම් "
 "<http://www.gnu.org/licenses/>. බලන්න."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "යළි ධාවන පාලන යතුරු පෙන්නන්න  "
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "නිතර නිවේදන පෙන්නන්න"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2511,21 +2592,21 @@ msgstr ""
 msgid "Show"
 msgstr "පෙන්නන්න "
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "විරාමය "
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "ඊළඟ  "
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 ප්‍රතිදානය"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2567,23 +2648,23 @@ msgstr ""
 "#audacious හි මිනිසුන් වෙත ස්තූති කරමි, විශේෂයෙන් Tony Vroon සහ​ John Lindgren මෙන්ම පෙර "
 "OSS පේනු මෘදුකාංගයයෙහි කතෘන් හට ."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2595,49 +2676,34 @@ msgstr "PLS ධාවන ලැයිස්තුව​"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "PSF PSF1/PSF2 විකේතකය විවෘත කරන්න "
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "ශ්‍රව්‍ය ස්පන්ද ප්‍රතිදානය "
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio ප්‍රතිදාන​ පේනු මෘදුකාංගය\n"
-"\n"
-"මෙම​ මෘදුකාංගය නිදහස් මෘදුකාංගයකි; නිදහස් මෘදුකාංග පදනම විසින් ප්‍රකාශ කරන ලද GNU සාමාන්‍ය "
-"පොදු බලපත්‍රය යටතේ ඔබට මෙය නැවත බෙදා හැරීම හෝ වෙනස් කිරීම කළ හැක​; බලපත්‍රයේ 2වන "
-"සංස්කරණය හෝ(ඔබගේ කැමත්ත අනුව​) පසු සංස්කරණයක් යටතේ.\n"
-"\n"
-"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත​; විකිණිය "
-"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
-"පොදු බලපත්‍රය බලන්න​. \n"
-"\n"
-"මෙම මෘදුකාංගය සමග ඔබට GNU සාමාන්‍ය පොදු බලපත්‍රයහි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් "
-"මෘදුකාංග පදනමට දන්වන්න​. Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2646,47 +2712,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "පෙර "
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "නැවත  කරන්න "
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "කලවම් කරන්න "
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2730,7 +2813,7 @@ msgstr "<b>පරිවර්තනය</b>"
 msgid "Method:"
 msgstr "ක්‍රමය "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "අනුපාතය:"
 
@@ -2782,55 +2865,42 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 කිලෝ හරට්ස්:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "ඔව්. \tපරිශ්‍රීලක: %s සදහා භාවිත දත්ත සුරකින්න"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "අනුමැතිය තහනම් කිරීම "
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Audacious සදහා භාවිත දත්ත සුරකීමට මෙම අමුණට පිවිසෙන්න :"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "මම කවුළුව විවෘත​ව තබා 'අවසර පිරික්සන්න' නැවත ක්ලික් කරන්න\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"කණගාටු නොවන්න ඔබගේ භාවිත දත්ත ඔබගේ පරිගණකයේ ම සුරක්ෂිත කරයි.\n"
-"ඒවා Audacious සදහා අවසර ලැබුණු වහාම සුරක්ෂිත වේ"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "ජාල ගැටළු."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "අවසානයට සම්බන්ධ වීමේ ගැටළුවක් විය.fm.කරුණාකර පසුව නැවත උත්සහ කරන්න "
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "පිරික්සන..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_heck අනුමැතිය "
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_අනුමැතිය අවලංගු කිරීම "
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "ඔබ ඔඩෙෂස් හට ඔබගේ අවසාන fm ගිණුමෙන් ගීත ලබා ගැනීමට අවසර දිය යුතුය.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2858,7 +2928,7 @@ msgstr ""
 "\n"
 "ප්‍රකාශන අයිතිය © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2866,11 +2936,11 @@ msgstr ""
 "Audacious අවසානයට වැඩි දියුණුකළ අනුවාදය භාවිත කරයි.fm Scrobbler.⏎ \n"
 "කරුණාකර Scrobbler පේනු මෘදුකාංගයේ අභිරුචිය පරීක්ෂා කර බලන්න."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL ප්‍රතිදානය"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2878,69 +2948,69 @@ msgstr ""
 "Audacious සඳහා වන SDL ප්‍රතිදාන​ පේනු මෘදුකාංගය\n"
 "ප්‍රකාශන අයිතිය 2010 ජෝන් ලින්ඩ්ග්‍රෙන්"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "පුස්තකාලය "
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_ධාවන ලැයිස්තුව​ තනන්න "
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_ධාවන ලැයිස්තුව​ට එකතු කරන්න "
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "පුස්තකාලය සොයන්න "
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "ඔඩෙෂස් තුලට ඔබගේ ගීත පුස්තකාලය ආයාත කිරීමට, ෆෝල්ඩරයක් තෝරා \"නැවුම් කරන්න\" නිරූපකය ඔබන්න."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "කරුණාකර රැඳී සිටින්න ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "ෆෝල්ඩරය තෝරන්න "
 
@@ -3034,15 +3104,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "පුනරාවර්ථන ස්ථාන හිස් කරන ලදී."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "පුනරාවර්ථන ස්ථානය A කුලකය."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "පුනරාවර්ථන ස්ථානය B කුලකය."
 
@@ -3094,373 +3164,381 @@ msgstr "16  හරට්ස් "
 msgid "Audacious Equalizer"
 msgstr "ඔඩෙෂස් ඉකුවලිසරය "
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "සොයනවා %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "ශබ්ද මට්ටම​ : %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "තුලනය : %d%% වමට "
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "තුලනය: මැදට "
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "තුලනය: %d%% දකුණට "
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "විකල්ප මෙනුව "
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "අක්‍රිය කරන්න 'සැමවිටම  ඉහළ '"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "සක්‍රිය කරන්න 'සැමවිටම  ඉහළ '"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "ගොනු තොරතුරු පෙට්ටිය "
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "පිළිවැයීම"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "ධාවන ලැයිස්තුව​"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "දක්වන්න "
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "ධාවන ලැස්තු නැත "
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "නව ධාවන ලැයිස්තුව​"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "ධාවන ලැස්තු සකසනය පෙන්වන්න "
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr " ඉකුවලිසරය  පෙන්වන්න "
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "සැමවිටම  ඉහළ"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "මාතෘකාවෙන් "
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "සියල්ල ඉවත් කරන්න "
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "පෙළගැස්ම හිස් කරන්න"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "අනුපයෝජ්‍ය ගොනු ඉවත් කරන්න "
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "ද්විකරණ ඉවත් කරන්න "
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "තෝරානොගත් ඒවා ඉවත් කරන්න "
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "තෝරාගත් ඒවා ඉවත් කරන්න "
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "සොයන්න සහ තෝරන්න "
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "වරණය පෙරලන්න "
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "කිසිවක් තෝරානොගන්න "
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "සියල්ල තෝරන්න"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "ඛණ්ඩ අංකයෙන් "
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "ශිල්පියාගෙන් "
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "ඇල්බමයෙන් "
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "සසම්භාවී ධාවන ලැයිස්තුව "
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "ලැස්තුවේ  ආපස්සට යන්න "
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "තෝරාගත් අනුපිළිවලට "
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "ලැයිස්තුව අනුපිළිවලට සකසන්න "
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "කපන්න "
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "පිටපත් කරන්න "
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "අලවන්න "
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3473,15 +3551,15 @@ msgstr "ඔඩෙෂස් ධාවන ලැස්තු සකසනය "
 msgid "%s (%d of %d)"
 msgstr "%s (%d ගෙන්  %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp සම්භාව්‍ය අතුරු මුහුණත"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3569,7 +3647,7 @@ msgid "Slow"
 msgstr "මන්දගාමි"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "මධ්‍යම "
 
@@ -3704,7 +3782,7 @@ msgstr "ගැලපෙන පිවිසුම් සමග නව ධාව�
 msgid "Sndfile Plugin"
 msgstr "Snd ගොනු පේනු මෘදුකාංගය"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3743,66 +3821,66 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "ගීත වෙනස්කිරීම "
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3817,21 +3895,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Sox නැවත සාම්පල කිරීම "
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3845,43 +3923,43 @@ msgstr ""
 "නියැදි අනුපාත පරිවර්තන පේනු මෘදුකාංගය මත පදනම් වී ඇත​:\n"
 "ප්‍රකාශන අයිතිය 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "කඩිනම්"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "පහළ"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "ඉහළ"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "අති- උච්ච"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "ප්‍රශස්තතාව:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "වේගය සහ ස්වරමානය"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>වේගය සහ ස්වරමානය</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "වේගය:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "ස්වරමානය:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "තත්ව නිරූපකය"
 
@@ -3977,12 +4055,12 @@ msgstr "<b>අතිරේක ත්‍රිමාන</b>"
 msgid "Tone Generator"
 msgstr "ස්වර ජනකය"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f හර්ට්ස් "
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "ස්වර ජනකය:"
 
@@ -4004,7 +4082,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "කටහඬ ඉවත් කිරීම​"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4070,7 +4148,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX විකේතකය"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4080,19 +4158,29 @@ msgstr ""
 "Based on in_vtx.dll Roman Sherbakov විසින් <v_soft@microfor.ru>\n"
 "Audacious පේනු මෘදුකාංගය Pavel Vymetalek විසින් <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack විකේතකය"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "හානිමත් (දෙමුහුන්)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "හානිමත් "
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4105,14 +4193,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr " 2SF විකේතකය"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML හුවමාරු කළ හැකි ධාවන ලැයිස්තුව​ (XSPF)"
diff --git a/po/sk.po b/po/sk.po
index 9b4c8dc..6a48e2b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,16 +5,17 @@
 # Translators:
 # Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2008, 2010, 2011
 # Lukáš Dobránsky <lukas.dobransky@gmail.com>, 2012
+# Tomáš Tomovčík <tomovcik.tomas@gmail.com>, 2016
 # Tomáš Vadina <tomasvadina+transifex@cryptolab.net>, 2012
 # Corduroy <vdcorduroy@gmail.com>, 2013
 # Corduroy <vdcorduroy@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Tomáš Tomovčík <tomovcik.tomas@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/jlindgren/audacious/language/"
 "sk/)\n"
 "Language: sk\n"
@@ -23,28 +24,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "AAC (Raw) dekodér"
 
 #: src/adplug/adplug-xmms.cc:42
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib prehrávač)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "sekvenčný"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
-msgstr ""
+msgstr "Nastaviť alarm..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -54,7 +55,7 @@ msgstr ""
 "\n"
 "Napísali Adam Feakin a Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -105,147 +106,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Toto je budiaci signál."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
-msgstr ""
+msgstr "Vaša pripomienka na dnes je..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Upozornenie"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Čas"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Budiť o (predvolené):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Ticho po:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "hodín"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minút"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Vyberte dni, kedy má budík budiť"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Deň"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dni"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Zosilovanie"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Hlasitosť"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Začať na"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Skončiť na"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Aktuálna"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Dodatočný príkaz"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "povoliť"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Zoznam skladieb (voliteľné)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Vyber zoznam skladieb"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Čo tieto možnosti znamenajú?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Pomocník"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Album"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA výstup"
 
@@ -265,7 +266,7 @@ msgstr ""
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(žiadny popis)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -287,11 +288,11 @@ msgstr "Zariadenie mixéra:"
 msgid "Mixer element:"
 msgstr "Prvok mixéra:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI prehrávač)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -314,68 +315,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "Zapnúť"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -383,86 +384,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - vyberte SoundFont súbor"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
-msgstr ""
+msgstr "_Zrušiť"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
-msgstr ""
+msgstr "_Otvoriť"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Veľkosť (v bajtoch)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Názov:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Podrobnosti o MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Dĺžka (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Počet stôp:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "premenlivé"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Čas. pomer:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Komentáre a slová MIDI skladby </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne komentáre *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne texty skladby *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Zatvoriť"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (neplatné UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -474,7 +489,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -526,94 +541,94 @@ msgstr "Obnovenie prehrávania"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD sa zobrazí keď je prehrávanie obnovené."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Relatívne odsadenie v smere osi X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Relatívne odsadenie v smere osi Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maximálna šírka OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Nastavenia pre viac monitorov"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Zobraziť OSD na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "všetkých monitoroch"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "monitore %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Časovanie (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Zobrazenie:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Rozsvietenie:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Zhasnutie:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Písmo %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Tieň"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Štýl zobrazenia"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Farba %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Povoliť spúšťač"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Udalosť"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Bol zistený kompozitný správca"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -623,62 +638,58 @@ msgstr ""
 "Ak viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak "
 "nebude OSD pracovať správne"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Pri falošnej priehľadnosti nie je potrebný kompozitný správca"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Priehľadnosť"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Falošná priehľadnosť"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutočná priehľadnosť (vyžaduje kompozitné rozšírenie X servera)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Kompozitné rozšírenie nie je načítané"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozitné rozšírenie nie je dostupné"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>OSD Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animácia"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -692,11 +703,11 @@ msgstr "ASXv1/ASXv2 zoznamy skladieb"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious zoznamy skladieb (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Farba</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Rozsah rozostrenia"
 
@@ -720,15 +731,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "Frekvencia pre vystrihnutie:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Analyzér spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Audio CD zásuvný modul"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -748,118 +759,118 @@ msgstr ""
 "\n"
 "Toto bol Google Summer of Code 2007 projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "Zariadenia"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Rýchlosť disku:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Prepísať zariadenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "&lt;b&gt;Metadáta&lt;/b&gt;"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Použiť CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Použiť CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Namiesto CDDBP použiť HTTP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Cesta: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Zlyhala inicializácia cdio podsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d sa nenašla."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Stopa %d je dátová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Chyba pri čítaní audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Zlyhalo CD zariadenie %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Nebolo nájdené žiadne spôsobilé CD zariadenie."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Zlyhalo dokončenie inicializácie otvoreného CD zariadenia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Zlyhalo načítanie prvého/posledného čísla skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Nie je možné prečítať začiatok/koniec LSN pre stopu %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Zlyhalo vytvorenie cddb pripojenia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Nepodaril sa dotaz na CDDB server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodaril sa dotaz na CDDB server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Zlyhalo načítanie cddb info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Mechanika je prázdna."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný typ disku."
 
@@ -1018,58 +1029,60 @@ msgstr "Intenzita:"
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet zásuvný modul"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1107,11 +1120,11 @@ msgstr "Hlasitosť:"
 msgid "Echo"
 msgstr "Ozvena"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg zásuvný modul"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1128,15 +1141,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Zápis do súboru zásuvný modul"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Vybrať priečinok"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1153,194 +1162,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Formát výstupného súboru:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Ukladať do pôvodného adresára"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Všeobecné"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Kvalita algoritmu:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Dátový tok (kb/s):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Kompresný pomer:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Zvukový režim:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Ochrana pred chybami"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvalita"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Povoliť VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Nastavenia VBR:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Najmenší dátový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Najväčší dátový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Prísne vynucovať najmenší dátový tok"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Nastavenia ABR:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Priemerný dátový tok (kb/s):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Prísne vynucovať najmenší dátový tok"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Pridať označenie autorských práv"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Pridať označenie originálu"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Vynútiť pridanie značiek verzie 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Pridávať iba značky verzie 1"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Pridávať iba značky verzie 2"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvalita"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Značky"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Úroveň kvality (0-10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Všeobecné"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC dekodér"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "bezstratový"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1352,7 +1445,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1360,19 +1453,19 @@ msgstr ""
 "GIO zásuvný modul pre Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO zásuvný modul"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1384,23 +1477,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1417,8 +1497,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Názov"
@@ -1475,8 +1555,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Vyhľadávací nástroj"
 
@@ -1504,335 +1584,338 @@ msgstr "Uvolniť"
 msgid "Disable"
 msgstr "Zakázať"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Otvoriť súbory ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Otvoriť _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Prid_ať súbory ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Pridať U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "_O programe ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Hrať"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "P_ozastaviť"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "Za_staviť"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Pred_chádzajúca"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Nasledujúca"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "O_pakovať"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "Ná_hodné prehrávanie"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Nep_okračovať podľa zoznamu skladieb"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Zastaviť po tejto skladbe"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Informácie o skladbe ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "S_kočiť na čas ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Skočiť na sk_ladbu ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Podľa _názvu"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Podľa čí_sla stopy"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Podľa _umelca"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Podľa dátumu vy_dania"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Podľa _cesty k súboru"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Podľa vlastného ná_zvu"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Obrátené poradie"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "Náhodné po_radie"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Obnoviť"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Zoradiť"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Odstrániť nedost_upné súbory"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Pre_menovať ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importovať ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportovať ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Správca_zoznamu skladieb ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Správca _fronty .."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Zo_silniť"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "S_tíšiť"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Zobraziť _panel s ponukou"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Zobraziť panel s i_nformáciami"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Zobraziť znázornenie oblasti informácií"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Zobraziť panel so _stavom"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Prehrávanie"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Zoznam sk_ladieb"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "Pridať alebo odobrať z _fronty"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Vys_trihnúť"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "V_ložiť"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Ozn_ačiť všetko"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Premenovať ..."
 
@@ -1873,33 +1956,32 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Rozhranie GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Napĺňanie vyrovnávajúcej pamäte ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1907,25 +1989,25 @@ msgstr[0] "%d kanálov"
 msgstr[1] "%d kanál"
 msgstr[2] "%d kanály"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Režim jednej skladby."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Režim zoznamu skladieb."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Zastaviť po skončení skladby."
 
@@ -1933,9 +2015,9 @@ msgstr "Zastaviť po skončení skladby."
 msgid "Previous track"
 msgstr "Predchádzajúca skladba"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Prehrať"
 
@@ -1943,8 +2025,8 @@ msgstr "Prehrať"
 msgid "Pause/Resume"
 msgstr "Pozastaviť/Pokračovať"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Zastaviť"
 
@@ -2043,7 +2125,7 @@ msgstr "<b>Priradenie klávesu:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globálne klávesové skratky"
 
@@ -2073,35 +2155,35 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2201,48 +2283,48 @@ msgstr "Znovu sa pripojiť k serveru LIRC"
 msgid "Wait before reconnecting:"
 msgstr "Počkajte pred opätovným pripojením:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki zásuvný modul"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Žiadne texty k dispozícii"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Chyba"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nedá sa načítať %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nedá sa analyzovať %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Vyhľadáva sa text skladby..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Chýba metadata skladby"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Pripájanie na lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2254,17 +2336,17 @@ msgstr "M3U zoznam skladieb"
 msgid "Tact Generator"
 msgstr "Generátor taktov"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2419,15 +2501,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 zásuvný modul"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Priestorový zvuk"
 
@@ -2439,35 +2521,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS zásuvný modul"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Zastavené"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious teraz neprehráva."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Oznámenia na plochu"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2487,15 +2569,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2503,21 +2585,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2559,23 +2641,23 @@ msgstr ""
 "Chcem poďakovať ľuďom z #audacious, najmä Tonymu Vroonovy a Johnovy "
 "Lindgrenovy a samozrejme autorom predošlého OSS zásuvného modulu."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2587,51 +2669,34 @@ msgstr "PLS zoznamy skladieb"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodér"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio výstup"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious PulseAudio výstupný zásuvný modul\n"
-"\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"
-"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,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2640,47 +2705,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Náhodné poradie"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2724,7 +2806,7 @@ msgstr "<b>Prevod</b>"
 msgid "Method:"
 msgstr "Metóda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Hodnotenie:"
 
@@ -2776,52 +2858,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Vyskytol sa problém s pripojením k Last.fm. Prosím, skúste to neskôr."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2845,7 +2916,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2853,11 +2924,11 @@ msgstr ""
 "Audacious odteraz používa vylepšenú verziu doplnku Last.fm Scrobbler.\n"
 "Prosím, skontrolujte Predvoľby doplnku Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL výstup"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2865,13 +2936,13 @@ msgstr ""
 "SDL výstupný zásuvný modul pre Aduacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Knižnica"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -2879,7 +2950,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -2887,7 +2958,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2895,31 +2966,31 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Vytvoriť zoznam skladieb"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Pridať do zoznamu skladieb"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Vyhľadať knižnicu"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2927,11 +2998,11 @@ msgstr ""
 "Pre import hudobnej knižnice do Audacious, vyberte priečinok a potom "
 "kliknite na ikonu \"obnoviť\"."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Čakajte prosím ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Vybrať priečinok"
 
@@ -3025,15 +3096,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -3085,373 +3156,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "prejsť na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitosť: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyváženie: %d%% vľavo"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Vyváženie: stred"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyváženie: %d%% vpravo"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Ponuka s možnosťami"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Vypnúť „Vždy navrchu“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Zapnúť „Vždy navrchu“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Informácie o súbore"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Prehrávanie"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Zoznam skladieb"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Zobrazenie"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Nový zoznam skladieb"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Zobraziť editor zoznamu skladieb"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Zobraziť ekvalizér"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Vždy navrchu"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Podľa názvu"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Vyprázdniť front"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Odstrániť nedostupné súbory"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Odstrániť duplikáty"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Odstrániť neoznačené"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Hľadanie a výber"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Invertovať výber"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Zrušiť výber"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Označiť všetko"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Podľa čísla stopy"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Podľa umelca"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Podľa albumu"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Premiešať poradie"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Obrátiť poradie"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Triediť výber"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Triediť zoznam"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Vložiť"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3464,15 +3543,15 @@ msgstr "Editor zoznamu skladieb"
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp Classic Interface"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3560,7 +3639,7 @@ msgid "Slow"
 msgstr "Pomaly"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Stredne"
 
@@ -3696,7 +3775,7 @@ msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
 msgid "Sndfile Plugin"
 msgstr "Sndfile zásuvný modul"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3736,66 +3815,66 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Zmena skladby"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3810,21 +3889,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3833,43 +3912,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Rýchlosť a výška"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Rýchlosť a výška</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Rýchlosť"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Výška"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
@@ -3965,12 +4044,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Generátor tónov"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generátor tónov: "
 
@@ -3992,7 +4071,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Odstránenie hlasu"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4058,7 +4137,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX dekodér"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4068,19 +4147,29 @@ msgstr ""
 "Založené na in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious zásuvný modul napísal Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack dekodér"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "stratový (hybrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "stratový"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4094,14 +4183,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF dekodér"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"
diff --git a/po/sr.po b/po/sr.po
index 970d1f4..24037a1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,11 +6,11 @@
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-12-22 20:23+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Serbian (http://www.transifex.com/jlindgren/audacious/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "ААЦ (Сирови) декодер"
 
@@ -28,20 +28,20 @@ msgstr "ААЦ (Сирови) декодер"
 msgid "AdPlug (AdLib Player)"
 msgstr "Ад прикључак (АдБибл програм)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "низовни"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Аларм"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Подеси аларм ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "Првобитни аутори су Адам Фикин и Данијел Стоден."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -149,147 +149,147 @@ msgstr ""
 "    Упишите подсетник у поље за унос и укључите\n"
 "    кућицу за избор ако желите да буде приказиван."
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ово је ваш позив за буђење."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Ваш подсетник за данас је..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Понедељак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Петак"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Недеља"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Време"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Активирај аларм у (основно):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "часова"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Утишај након:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "сат(а)"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "минута"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Изаберите којим данима ће се активирати аларм"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Дан"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Основно"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дани"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Ишчезавање"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунде"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Јачина"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Започни при"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Заврши при"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Тренутно"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Додатна наредба"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "укључи"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Списак нумера (необавезно)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Изаберите списак нумера"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опције"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Шта значе ове опције?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Омот албума"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Излаз АЛСА-е"
 
@@ -331,11 +331,11 @@ msgstr "Уређај миксера:"
 msgid "Mixer element:"
 msgstr "Елемент мешача:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "АМИДИ-Прикључак (МИДИ програм)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -377,68 +377,68 @@ msgstr ""
 "Тони Врун\n"
 "због одличне помоћи за алфа тестирање"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Препиши основно појачање:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Препиши основну полифонију:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Препиши основни одјек:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Укљ."
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Препиши основни хор:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Пуштање</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Премештај:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "полутонови"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Промена бубња:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "бројеви ноте"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Прескочи водећу тишину"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Прескочи пратећу тишину"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>СаундФонт</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Синтисајзер</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "Проток узорка:"
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -446,86 +446,100 @@ msgstr "Проток узорка:"
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "АМИДИ прикључак — изаберите СаундФонт датотеку"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "От_кажи"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "От_вори"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Величина (бајтова)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Назив:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> МИДИ подаци </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Запис:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Трајање (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Број нумера:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "променљиво"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "БПМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "БПМ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Див време:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> МИДИ коментари и текстови песама </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* нема доступних коментара у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* нема доступних текстова песама у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (неисправан УТФ-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -544,7 +558,7 @@ msgstr ""
 "Делом је заснован на библиотеци „Ghosd“ коју је написао Еван Мартин\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "БОСД (Приказ на екрану)"
 
@@ -596,94 +610,94 @@ msgstr "Отпаузирање"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Приказује ОСД када је репродукција поново покренута."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Постављање"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Релативан хоризонтални померај:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Релативан вертикални померај:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Највећа ширина приказа:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Опција више монитора"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Прикажи ОСД на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "свим мониторима"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "на монитору бр. %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Време трајања (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Приказ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Појављивање:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Ишчезавање:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Писмо %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Сенка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Стил исцртавања"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Боје"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Боја %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Омогући активирање"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Догађај"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Откривен је композитни управник"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -693,60 +707,56 @@ msgstr ""
 "осим ако знате да је један већ покренут, молим покрените композитног "
 "управника јер у супротном ОСД неће радити исправно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитни управник није потребан за лажну провидност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Провидност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Лажна провидност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Стварна провидност (захтева Х композитно проширење)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Композитно проширење није учитано"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитно проширење није доступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Безочник — ОСД</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Положај"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анимација"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Декорација"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Укључивање"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Остало"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Испробај"
 
@@ -762,11 +772,11 @@ msgstr "АСИксв1/АСИксв2 спискови нумера"
 msgid "Audacious Playlists (audpl)"
 msgstr "Безочникови спискови нумера (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Боје</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Обим замућења"
 
@@ -790,15 +800,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "Учестаност исецања:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Прикључак звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -818,118 +828,118 @@ msgstr ""
 "\n"
 "Беше то Гугл лето пројекта Кôд 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Уређај</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Брзина читања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Препиши уређај:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метаподаци</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Користи ЦД-текст"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Користи ЦДБП"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Користи ХТТП уместо ЦДДБП-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Путања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нисам успео да започнем цдуи подсистем."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Неисправна путања „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Нисам пронашао нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Нумера „%d“ је запис података."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Грешка читања звучног диска."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Нисам успео да отворим ЦД уређај „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Нисам пронашао уређај за читање ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Нисам успео да завршим покретање отвореног ЦД уређаја."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Нисам успео да пронађем број прве/последње нумере."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не могу да прочитам почетак/крај ЛСН-а за нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Нисам успео да направим везу са цд базом података."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Нисам успео да прочитам обавештење базе података цд-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Уређај је празан."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Неподржана врста диска."
 
@@ -1098,58 +1108,60 @@ msgstr "Јакост:"
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Прикључак „cue“ табеле"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Обриши датотеке"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Грешка премештања „%s“ у смеће: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Грешка брисања „%s“: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Грешка брисања „%s“: није месна датотека."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Да ли желите да преместите изабране датотеке у смеће?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Премести у смеће"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Да ли желите трајно да обришете изабране датотеке?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Обришите изабране датотеке"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Начин брисања</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Преместите у смеће уместо да одмах обришете"
 
@@ -1191,11 +1203,11 @@ msgstr "Јачина звука:"
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Прикључак ФФмпег-а"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1211,15 +1223,11 @@ msgstr ""
 "Вилијам Питкок <nenolod@nenolod.net>\n"
 "Мати Хамалајнен <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Прикључак записивања датотека"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Изаберите фасциклу"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1249,194 +1257,278 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA“."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Формат излазне датотеке:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Сачувај у оригиналном директоријуму"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "Сачувај у произвољном директоријуму:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Створи назив датотеке из:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "Изворног назива датотеке"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "Изворног назива датотеке (без суфикса)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "Изворне ознаке датотеке"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "Стави број нумере назива датотеке"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Опште"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Самостално"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Квалитет алгоритма:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "Излазни проток узорка:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "Проток бита / Однос сажимања:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Проток бита (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Однос сажимања:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Режим звука:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "Разно:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "Приморај изричиту ИСО сагласност"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Квалитет"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Укључи ППБ/СПБ"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Врста:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Опције ППБ-а:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Најмањи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Највећи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строго спроведи најмањи проток бита"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Опције СПБ-а:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Средњи проток бита (kb/s):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Ниво квалитета ППБ-а:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строго спроведи најмањи проток бита"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "Изостави Иксинг заглавље ППБ-а"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "ППБ/СПБ"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "Параметри кадра:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Означи као ауторско право"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Означи као оригинал"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ИД3 параметри:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Присили додавање ознаке издања 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Додај само в1 ознаку"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Додај само в2 ознаку"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Квалитет"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "ППБ/СПБ"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Ниво квалитета (0 — 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Опште"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "ФЛАЦ декодер"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "без губитака"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1448,7 +1540,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1456,19 +1548,19 @@ msgstr ""
 "ГУИ прикључак за Безочника\n"
 "Ауторска права 2009-2012 Џон Линдгрин"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "ГУИ прикључак"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Режим читај-и-прикачи није подржан"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Неисправан режим отварања"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1488,32 +1580,10 @@ msgstr ""
 "\n"
 "Дозвола: ОЈЛв2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "ОпенГЛ Анализатор спектра"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"ОпенГЛ анализатор спектра за Безочника\n"
-"Ауторска права 2013 Кристоф Буде, Џон Линдгрин, и Карло Брамини\n"
-"Ауторска права 2014 Вилијам Питкок\n"
-"\n"
-"Засновано на ИКсММС прикључку:\n"
-"Ауторска права 1998-2000 Питер Алм, Мајкол Алм, Оле Халнас, Томас Нилсон, и "
-"4Фронт Технологије\n"
-"\n"
-"Дозвола: ОЈЛв2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Гномове пречице"
@@ -1534,8 +1604,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Број ставке"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Наслов"
@@ -1592,8 +1662,8 @@ msgstr "Доступни ступци"
 msgid "Displayed columns"
 msgstr "Приказани ступци"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Алат за претрагу"
 
@@ -1621,335 +1691,338 @@ msgstr "Откачи"
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Додај да_тотеке ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Претражи _библиотеку"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Подешавања ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "Насумично према _албуму"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Заустави _након ове песме"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Постави _А тачку понављања"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Постави _Б тачку понављања"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Очисти тачке понављања"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "Према називу _датотеке"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Према броју _нумере"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "Према _албуму"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "Према извођачу албу_ма"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "Према _жанру"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "Према _трајању"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Према произвољном _наслову"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Пусти/Настави"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Поређај _означене"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Уклони _двоструке"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Уклони _недоступне датотеке"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Управник списка _нумера ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "_Уједначавач ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "_Дејства ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "_Сними ток"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "Подешавања _звука ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Прикажи траку _изборника"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Прикажи траку _података"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Прикажи _визуелизацију траке обавештења"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Прикажи преостало _време"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Визуелизације ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Преименуј ..."
 
@@ -1990,33 +2063,32 @@ msgstr "Стралице померају за:"
 msgid "Scroll on song change"
 msgstr "Клизај при промени песме"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s — Безочник"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2024,25 +2096,25 @@ msgstr[0] "%d канал"
 msgstr[1] "%d канала"
 msgstr[2] "%d канала"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
@@ -2050,9 +2122,9 @@ msgstr "Зауставља након песме."
 msgid "Previous track"
 msgstr "Претходна нумера"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Пусти"
 
@@ -2060,8 +2132,8 @@ msgstr "Пусти"
 msgid "Pause/Resume"
 msgstr "Паузирај/настави"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Заустави"
 
@@ -2160,7 +2232,7 @@ msgstr "<b>Свезе тастера:</b>"
 msgid "_Add"
 msgstr "_Додај"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
@@ -2191,25 +2263,25 @@ msgstr ""
 " Џонатан А. Давис <davis@jdhouse.org>\n"
 " Џереми Тан <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "ЏЕК излаз"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "Самостално повезивање на прикључнике излаза"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Нашао сам само %d излазна прикључка ЏЕК-а али су потребна %d."
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Нисам успео да се повежем на прикључник ЏЕК-а „%s“."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2217,11 +2289,11 @@ msgstr ""
 "ЏЕК подржава само звук покретног зареза.  Морате изменити дубину излазног "
 "бита на покретни зарез у подешавањима Безочника."
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Нисам успео да се повежем на сервер ЏЕК-а; да ли је покренут?"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2325,48 +2397,48 @@ msgstr "Поново се повежи са ЛИРЦ сервером"
 msgid "Wait before reconnecting:"
 msgstr "Сачекај пре поновног повезивања:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Прикључак за Лирик вики"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Нема доступних текстова"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Грешка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не могу да довучем „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не могу да обрадим „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Тражим текст песме ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Недостају метаподаци песме"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Повезујем се на „lyrics.wikia.com“ ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Уреди текстове песама ..."
 
@@ -2378,17 +2450,17 @@ msgstr "М3У списак нумера"
 msgid "Tact Generator"
 msgstr "Генератор такта"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2544,15 +2616,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "МПГ123 прикључак"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Напредно</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "Користи тачан прорачун трајања (споро)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Окружење"
 
@@ -2564,35 +2636,35 @@ msgstr "МПРИС 2 сервер"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Неон ХТТП/ХХТПС прикључак"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Грешка обраде преусмерења"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Непозната ХТТП грешка"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "Грешка обраде адресе"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "Превише преусмерења"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Безочник не пушта песме."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Обавештења радне површи"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2628,15 +2700,15 @@ msgstr ""
 "Требали сте да примите примерак Гнуове опште јавне лиценце уз овај\n"
 "програм. Ако нисте, погледајте <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Прикажи дугмад за пуштање"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Звек прикажи обавештења"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "Укључи назив албума у обавештењу"
 
@@ -2644,21 +2716,21 @@ msgstr "Укључи назив албума у обавештењу"
 msgid "Show"
 msgstr "Прикажи"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Паузирај"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Следећа"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "ОСС4 излаз"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "ОСС3 излаз"
 
@@ -2700,23 +2772,23 @@ msgstr ""
 "Желим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону "
 "Линдгрину и наравно ауторима претходног ОСС прикључка."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Управник списка нумера"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Уноси"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "_Преименуј"
 
@@ -2728,52 +2800,34 @@ msgstr "ПЛС спискови нумера"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "ОпенПСФ ПСФ1/ПСФ2 декодер"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Пулс‑аудио излаз"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"ПулсеАудио излазни прикључак Безочника\n"
-"\n"
-"Овај програм је слободан софтвер; можете га прослеђивати\n"
-"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера; верзије 2 лиценце\n"
-"или (по вашем избору) било које новије верзије.\n"
-"\n"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
-"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
-"\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм; ако нисте, пишите Задужбини слободног\n"
-"софтва на адресу: Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "Излаз Кут мултимедија"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2787,47 +2841,73 @@ msgstr ""
 "Засновано на прикључку СДЛ излаза за Безочника\n"
 "Ауторска права 2010 Џон Линдгрин"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"ОпенГЛ анализатор спектра за Безочника\n"
+"Ауторска права 2013 Кристоф Буде, Џон Линдгрин, и Карло Брамини\n"
+"Ауторска права 2014 Вилијам Питкок\n"
+"\n"
+"Засновано на ИКсММС прикључку:\n"
+"Ауторска права 1998-2000 Питер Алм, Мајкол Алм, Оле Халнас, Томас Нилсон, и "
+"4Фронт Технологије\n"
+"\n"
+"Дозвола: ОЈЛв2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Радим ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Потражи"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "Отвори _фасциклу ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Додај фасциклу ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "Надзорник _дневника ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Отвори датотеке"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Додај датотеке"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Претходна"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Понови"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Насумично"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "Отвори _фасциклу ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Додај фасциклу ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "Надзорник _дневника ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Кут сучеље"
 
@@ -2871,7 +2951,7 @@ msgstr "<b>Претварање</b>"
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Проток:"
 
@@ -2923,59 +3003,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "У реду. Скроблујем за корисника: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Овлашћења су одбијена"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Приступите следећој вези да омогућите Безочнику да скроблује ваша пуштања:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Задржите овај прозор отвореним и опет притисните „Провери овлашћења“.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не брините. Ваша скробловања су сачувана на вашем рачунару.\n"
-"Биће послата чим Безочнику то буде било омогућено."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблем са мрежом."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"Дошло је до проблема ступања у везу са Ласт.фм-ом. Касније покушајте поново."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверавам..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Провери овлашћења"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Уклони овлашћења"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Требате да омогућите Безочнику да скроблује нумере до вашег Ласт.фм налога.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -3006,7 +3069,7 @@ msgstr ""
 "Захваљујем се Џону Линдгрину што ми је помогао на почетку овог пројекта.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3014,11 +3077,11 @@ msgstr ""
 "Безочник сада користи побољшано издање Ласт.фм-овог Скроблера.\n"
 "Проверите у поставкама за прикључком Скроблера."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "СДЛ излаз"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3026,13 +3089,13 @@ msgstr ""
 "Прикључак СДЛ излаза за Безочника\n"
 "Ауторска права 2010 Џон Линдгрин"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -3040,7 +3103,7 @@ msgstr[0] "%d резултат"
 msgstr[1] "%d резултата"
 msgstr[2] "%d резултата"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -3048,7 +3111,7 @@ msgstr[0] "(%d скривена)"
 msgstr[1] "(%d скривене)"
 msgstr[2] "(%d скривених)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3056,31 +3119,31 @@ msgstr[0] "%d песма"
 msgstr[1] "%d песме"
 msgstr[2] "%d песама"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "овог жанра"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr " "
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "изводи"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Направи списак нумера"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Додај у списак нумера"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Претражите библиотеку"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3088,11 +3151,11 @@ msgstr ""
 "Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим "
 "кликните на иконицу „освежи“."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Молим сачекајте ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Изаберите фасциклу"
 
@@ -3188,15 +3251,15 @@ msgstr "Осетљивост:"
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Понови очишћене тачке."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Понови скуп тачке А."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Понови скуп тачке Б."
 
@@ -3248,373 +3311,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Уједначавач Безочника"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Јачина звука: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Уравнотеженост: %d%% леви"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Уравнотеженост: центрирано"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Уравнотеженост: %d%% десни"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Изборник опција"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Искључи „Увек у првом плану“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Укључи „Увек у првом плану“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Поље података датотеке"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "Двострука величина"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Визуализације"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "Снимање је укључено"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "Снимање је искључено"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Појачај"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Утишај"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Дејства ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "Сними ток"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "Подешавања звука ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Отвори датотеке ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Отвори адресу ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Претражи библиотеку"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Пуштање"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Списак нумера"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Излаз"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Поглед"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Услуге"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "О програму ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Подешавања ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Подаци о песми ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "Насумично према албуму"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Не напредуј у списку нумера"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Заустави након ове песме"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Постави А—Б понављања"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Очисти А—Б понављања"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Пређи на песму ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Пређи на време ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Пусти/Настави"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Преименуј списак нумера ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Претходни списак нумера"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Следећи списак нумера"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Увези списак нумера ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Извези списак нумера ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Управник списка нумера ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Управник редоследа ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Освежи списак нумера"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Прикажи уређивач списка нумера"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Прикажи уједначавач"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Прикажи преостало време"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Увек у првом плану"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "Све на радне просторе"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Замотај плејер"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Замотај уређивач списка нумера"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Замотај уједначавач"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Додај адресу ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Додај датотеке ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Према наслову"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "Према називу датотеке"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "Према путањи датотеке"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Обриши заказано"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Уклони недоступне датотеке"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Уклони дупликате"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Уклони неозначене"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Уклони означене"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Претражи и означи"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Обрни избор"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Означи ништа"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Према броју нумере"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Према извођачу"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Према албуму"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "Према извођачу албума"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "Према датуму издавања"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "Према жанру"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "Према трајању"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "Према произвољном наслову"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Насумице испремештај списак"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Преокрени списак"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Поређај означене"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Поређај списак"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "Стави у ред/Избаци из реда"
 
@@ -3627,15 +3698,15 @@ msgstr "Уређивач списка нумера"
 msgid "%s (%d of %d)"
 msgstr "%s (%d од %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Винампово уобичајено сучеље"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Отвори фасциклу ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Додај фасциклу ..."
 
@@ -3723,7 +3794,7 @@ msgid "Slow"
 msgstr "Споро"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Средње"
 
@@ -3859,7 +3930,7 @@ msgstr "Направи нови списак нумера са подудара�
 msgid "Sndfile Plugin"
 msgstr "Прикључак звучне датотеке"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3900,60 +3971,60 @@ msgstr ""
 "софтва на адресу: Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Излаз звкуи"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Уређај (празно за основно):"
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Сачувај и врати јачину звка:"
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Звкуи грешка: Неподржан запис звука (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Звкуи грешка: није успело „sio_open()“"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Звкуи грешка: није успело „sio_setpar()“"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Звкуи грешка: није успело „sio_start()“"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>Наредбе</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "Наредба за покретање приликом почетка нове песме:"
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "Наредба за покретање при крају песме:"
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "Наредба за покретање при крају списка нумера:"
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Наредба за покретање када се промени наслов песме (за мрежне токове):"
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3961,7 +4032,7 @@ msgstr ""
 "Можете да користите следеће шифре записа, које ће бити замењене пре "
 "покретања наредбе (нису све корисне за наредбу крај-списка-нумера):"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3987,7 +4058,7 @@ msgstr ""
 "%t: Место на списку нумера\n"
 "%T: Наслов (необликовано)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
@@ -3995,15 +4066,15 @@ msgstr ""
 "Параметри прослеђени љусци би требало да буду под знацима наводника.  "
 "Параметри без наводника могу довести до неочекиваних резултата."
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Подаци о песми"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "СоКС поновни узорковач"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4017,43 +4088,43 @@ msgstr ""
 "Засновано на прикључку претварача протока узорка:\n"
 "Ауторска права 2010-2012 Џон Линдгрин"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Брзо"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Ниско"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Високо"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Врло високо"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Квалитет:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Брзина и врхунац</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Врхунац:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Иконица стања"
 
@@ -4157,12 +4228,12 @@ msgstr "<b>Додатни стерео</b>"
 msgid "Tone Generator"
 msgstr "Тонски генератор"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
@@ -4185,7 +4256,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Уклањање гласа"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4262,7 +4333,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "ВТКС декодер"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4274,19 +4345,29 @@ msgstr ""
 "ru>\n"
 "Прикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Вејвпак декодер"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "ослабљено (хибридно)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "ослабљено"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4300,31 +4381,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2СФ декодер"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>ИксСФ подешавања</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "Занемари трајање из датотеке"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "ИксМЛ дељиви спискови пуштања (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "Постепени прелаз није успео јер је песма имала различит број канала. "
-#~ "Можете да користите Мешача канала да претворите песме на исти број канала."
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "Постепени прелаз није успео јер је песма имала различит проток узорка.  "
-#~ "Можете да користите Претварача протока узорка да претворите песме на исти "
-#~ "проток узорка."
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 40599bf..e92bfb2 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -6,10 +6,10 @@
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Serbian (Serbia) (http://www.transifex.com/jlindgren/"
 "audacious/language/sr_RS/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -28,20 +28,20 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "Ад прикључак (АдБибл програм)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "низовни"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Аларм"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "Првобитни аутори су Адам Фикин и Данијел Стоден."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -102,147 +102,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Ово је ваш позив за буђење."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Понедељак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Петак"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Недеља"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Време"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Активирај аларм у (основно):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "часова"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Утишај након:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "сат(а)"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "минута"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Изаберите којим данима ће се активирати аларм"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Дан"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Основно"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дани"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Ишчезавање"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "секунде"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Јачина"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Започни при"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Заврши при"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Тренутно"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Додатна наредба"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "укључи"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Списак нумера (необавезно)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Изаберите списак нумера"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опције"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Шта значе ове опције?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Омот албума"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Излаз АЛСА-е"
 
@@ -284,11 +284,11 @@ msgstr "Уређај миксера:"
 msgid "Mixer element:"
 msgstr "Елемент мешача:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "АМИДИ-Прикључак (МИДИ програм)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -311,68 +311,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -380,86 +380,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "АМИДИ прикључак — изаберите СаундФонт датотеку"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Величина (бајтова)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Назив:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> МИДИ Информације </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Трајање (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Број нумера:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "променљиво"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "БПМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "БПМ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Див време:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> МИДИ коментари и текстови песама </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* нема доступних коментара у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* нема доступних текстова песама у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (неисправан УТФ-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -471,7 +485,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "БОСД (Приказ на екрану)"
 
@@ -523,94 +537,94 @@ msgstr "Отпаузирање"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Приказује ОСД када је репродукција поново покренута."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Постављање"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Релативан хоризонтални померај:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Релативан вертикални померај:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Највећа ширина приказа:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Опција више монитора"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Прикажи ОСД на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "свим мониторима"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "на монитору бр. %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Време трајања (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Приказ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Појављивање:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Ишчезавање:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Писмо %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Сенка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Стил исцртавања"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Боје"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Боја %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Омогући активирање"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Догађај"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Откривен је композитни управник"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -620,60 +634,56 @@ msgstr ""
 "осим ако знате да је један већ покренут, молим покрените композитног "
 "управника јер у супротном ОСД неће радити исправно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитни управник није потребан за лажну провидност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Провидност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Лажна провидност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Стварна провидност (захтева Х композитно проширење)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Композитно проширење није учитано"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитно проширење није доступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Безочник — ОСД</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Положај"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анимација"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Декорација"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Укључивање"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Остало"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -689,11 +699,11 @@ msgstr "АСИксв1/АСИксв2 спискови нумера"
 msgid "Audacious Playlists (audpl)"
 msgstr "Безочникови спискови нумера (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Боје</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Обим замућења"
 
@@ -717,15 +727,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "Учестаност исецања:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Прикључак звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,118 +755,118 @@ msgstr ""
 "\n"
 "Беше то Гугл лето пројекта Кôд 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Уређај</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Брзина читања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Препиши уређај:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метаподаци</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Користи ЦД-текст"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Користи ЦДБП"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Користи ХТТП уместо ЦДДБП-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Путања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нисам успео да започнем цдуи подсистем."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Неисправна путања „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Нисам пронашао нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Нисам успео да отворим ЦД уређај „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Нисам пронашао уређај за читање ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Нисам успео да завршим покретање отвореног ЦД уређаја."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Нисам успео да пронађем број прве/последње нумере."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не могу да прочитам почетак/крај ЛСН-а за нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Нисам успео да направим везу са цд базом података."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Нисам успео да прочитам обавештење базе података цд-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Уређај је празан."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Неподржана врста диска."
 
@@ -1014,58 +1024,60 @@ msgstr "Јакост:"
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Прикључак „cue“ табеле"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1103,11 +1115,11 @@ msgstr "Јачина звука:"
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Прикључак ФФмпег-а"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1123,15 +1135,11 @@ msgstr ""
 "Вилијам Питкок <nenolod@nenolod.net>\n"
 "Мати Хамалајнен <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Прикључак записивања датотека"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Изаберите фасциклу"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1148,194 +1156,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Формат излазне датотеке:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Сачувај у оригиналном директоријуму"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Опште"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Самостално"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Квалитет алгоритма:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Проток бита (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Однос сажимања:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Режим звука:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Квалитет"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Укључи ВБР/АБР"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Врста:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "ВБР опције:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Најмањи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Највећи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строго спроведи најмањи проток бита"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "АБР опције:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Просечни проток бита (kb/s):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Ниво ВБР квалитета:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строго спроведи најмањи проток бита"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "ВБР/АБР"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Означи као ауторско право"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Означи као оригинал"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Присили додавање ознаке издања 2"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Додај само в1 ознаку"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Додај само в2 ознаку"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Квалитет"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "ВБР/АБР"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Ниво квалитета (0 — 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Опште"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "ФЛАЦ декодер"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "без губитака"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1347,7 +1439,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1355,19 +1447,19 @@ msgstr ""
 "ГУИ прикључак за Безочника\n"
 "Ауторска права 2009-2012 Џон Линдгрин"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "ГУИ прикључак"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1379,23 +1471,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1412,8 +1491,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Број ставке"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Наслов"
@@ -1470,8 +1549,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Алат за претрагу"
 
@@ -1499,335 +1578,338 @@ msgstr "Откачи"
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "Додај да_тотеке ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Према броју _нумере"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Према п_роизвољном наслову"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Уклони _недоступне датотеке"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Управник списка _нумера ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Прикажи траку _изборника"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Прикажи траку _података"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "Прикажи _визуелизацију траке обавштења"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Преименуј ..."
 
@@ -1868,33 +1950,32 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s — Безочник"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1902,25 +1983,25 @@ msgstr[0] "%d канал"
 msgstr[1] "%d канала"
 msgstr[2] "%d један канал"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
@@ -1928,9 +2009,9 @@ msgstr "Зауставља након песме."
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Пусти"
 
@@ -1938,8 +2019,8 @@ msgstr "Пусти"
 msgid "Pause/Resume"
 msgstr "Паузирај/настави"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Заустави"
 
@@ -2038,7 +2119,7 @@ msgstr "<b>Свезе тастера:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
@@ -2069,35 +2150,35 @@ msgstr ""
 " Џонатан А. Давис <davis@jdhouse.org>\n"
 " Џереми Тан <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "ЏЕК излаз"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2199,48 +2280,48 @@ msgstr "Поново се повежи са ЛИРЦ сервером"
 msgid "Wait before reconnecting:"
 msgstr "Сачекај пре поновног повезивања:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Прикључак за Лирик вики"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Нема доступних текстова"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Грешка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не могу да довучем „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не могу да обрадим „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Тражим текст песме ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Недостају метаподаци песме"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Повезујем се на „lyrics.wikia.com“ ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2252,17 +2333,17 @@ msgstr "М3У списак нумера"
 msgid "Tact Generator"
 msgstr "Генератор такта"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2417,15 +2498,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "МПГ123 прикључак"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Окружење"
 
@@ -2437,35 +2518,35 @@ msgstr "МПРИС 2 сервер"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Неон ХТТП/ХХТПС прикључак"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Безочник не пушта песме."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Обавештења радне површи"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2485,15 +2566,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2501,21 +2582,21 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Паузирај"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Следећа"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "ОСС4 излаз"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2557,23 +2638,23 @@ msgstr ""
 "Желим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону "
 "Линдгрину и наравно ауторима претходног ОСС прикључка."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2585,52 +2666,34 @@ msgstr "ПЛС спискови нумера"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "ОпенПСФ ПСФ1/ПСФ2 декодер"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "Пулс‑аудио излаз"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"ПулсеАудио излазни прикључак Безочника\n"
-"\n"
-"Овај програм је слободан софтвер; можете га прослеђивати\n"
-"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера; верзије 2 лиценце\n"
-"или (по вашем избору) било које новије верзије.\n"
-"\n"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
-"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
-"\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм; ако нисте, пишите Задужбини слободног\n"
-"софтва на адресу: Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2639,47 +2702,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Претходна"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Понови"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Насумично"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2723,7 +2803,7 @@ msgstr "<b>Претварање</b>"
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Проток:"
 
@@ -2775,52 +2855,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2844,17 +2913,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "СДЛ излаз"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2862,13 +2931,13 @@ msgstr ""
 "Прикључак СДЛ излаза за Безочника\n"
 "Ауторска права 2010 Џон Линдгрин"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -2876,7 +2945,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -2884,7 +2953,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2892,31 +2961,31 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Направи списак нумера"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Додај у списак нумера"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Претражите библиотеку"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2924,11 +2993,11 @@ msgstr ""
 "Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим "
 "кликните на иконицу „освежи“."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Молим сачекајте ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Изаберите фасциклу"
 
@@ -3022,15 +3091,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -3082,373 +3151,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Уједначавач Безочника"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Јачина звука: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Уравнотеженост: %d%% леви"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Уравнотеженост: центрирано"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Уравнотеженост: %d%% десни"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Изборник опција"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Искључи „Увек у првом плану“"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Укључи „Увек у првом плану“"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Поље информација о датотеци"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Репродукција"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Списак нумера"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Поглед"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Не напредуј у списку нумера"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Прикажи уређивач списка нумера"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Прикажи уједначавач"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Увек у првом плану"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "Према наслову"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Обриши заказано"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Уклони недоступне датотеке"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Уклони дупликате"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Уклони неозначене"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Уклони означене"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Претражи и означи"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Обрни избор"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Означи ништа"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "Према броју нумере"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "Према извођачу"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "Према албуму"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Насумице испремештај списак"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Преокрени списак"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Поређај означене"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Поређај списак"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3461,15 +3538,15 @@ msgstr "Уређивач списка нумера"
 msgid "%s (%d of %d)"
 msgstr "%s (%d од %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Винампово уобичајено сучеље"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3557,7 +3634,7 @@ msgid "Slow"
 msgstr "Споро"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Средње"
 
@@ -3693,7 +3770,7 @@ msgstr "Направи нови списак нумера са подудара�
 msgid "Sndfile Plugin"
 msgstr "Прикључак звучне датотеке"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3734,66 +3811,66 @@ msgstr ""
 "софтва на адресу: Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3808,21 +3885,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3831,43 +3908,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Брзина и врхунац</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Врхунац:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Иконица стања"
 
@@ -3963,12 +4040,12 @@ msgstr "<b>Додатни стерео</b>"
 msgid "Tone Generator"
 msgstr "Тонски генератор"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
@@ -3991,7 +4068,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Уклањање гласа"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4057,7 +4134,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "ВТКС декодер"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4069,19 +4146,29 @@ msgstr ""
 "ru>\n"
 "Прикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Вејвпак декодер"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "ослабљено (хибридно)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "ослабљено"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4095,14 +4182,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2СФ декодер"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "ИксМЛ дељиви спискови пуштања (XSPF)"
diff --git a/po/sv.po b/po/sv.po
index 5a27d12..0ee6341 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Bo Serrander <bserrander@gmail.com>, 2013
-# Gaius Anderson <gaius.ankh@gmail.com>, 2015
+# Bo Serrander <bserrander@gmail.com>, 2013,2016
+# Gaius Anderson <gaius.ankh@gmail.com>, 2015-2016
 # Henrik Mattsson-Mårn <h@reglage.net>, 2015
 # Luna Jernberg <bittin@cafe8bitar.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-12-31 16:05+0000\n"
-"Last-Translator: Henrik Mattsson-Mårn <h@reglage.net>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Swedish (http://www.transifex.com/jlindgren/audacious/"
 "language/sv/)\n"
 "Language: sv\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) Dekoder"
 
@@ -30,27 +30,30 @@ msgstr "AAC (Raw) Dekoder"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Spelare)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
-msgstr ""
+msgstr "sekvensierad"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Ställ in Alarm ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"En plugin som kan starta uppspelning vid en speciell tidpunkt.\n"
+"\n"
+"Ursprungligen skriven av Adam Feakin och Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -101,147 +104,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Detta är din väckarklocka."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Din påminelse idag är ..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Måndag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Fredag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Lördag"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Söndag"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Tid"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Larm på (standard):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Tyst efter:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "timmar"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "minuter"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
-msgstr ""
+msgstr "Välj dagar då alarmet ska sättas igång"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Dag"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Standard"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Dagar"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
-msgstr ""
+msgstr "Tonar"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Volym"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "Börja på"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
-msgstr ""
+msgstr "Slutlig"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Nuvarande"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Ytterligare Kommando"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "aktivera"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Spellista (valfritt)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Välj en spellista"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Vad betyder dessa inställningar?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Skivomslag"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA Utgång"
 
@@ -253,6 +256,11 @@ msgid ""
 "My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
 "code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"ALSA Output Plugin för Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mitt tack till William Pitcock, skapare av ALSA Output Plugin NG, vilkens "
+"kod tjänade som referens när ALSA-manualen inte räckte till."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -276,13 +284,13 @@ msgstr "Mixerenhet:"
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr ""
+msgstr "Mixelelement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Spelare)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -304,69 +312,88 @@ msgid ""
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modulär MIDI musikspelare\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"skapad av Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"speciellt tack till...\n"
+"\n"
+"Clemens Ladisch och Jaroslav Kysela\n"
+"för deras coola program aplaymidi och amixer; dom\n"
+"var väldigt användbara, tillsammans med alsa-lib docs, för\n"
+"att lära mer om ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"för den snygga midi keyboard loggan\n"
+"\n"
+"Tony Vroon\n"
+"för stor hjälp vid alpha testningen"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "På"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b> Uppspelning </ b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Hoppa över inledande tystnad"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Hoppa över avslutande tystnad"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Synthesizer</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -374,86 +401,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Öppna"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Storlek (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Info </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Längd (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Nummer av Spår:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* Inga kommentarer finns i denna MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Inga texter finns i denna MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Stäng"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(ogiltig UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -465,7 +506,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -517,154 +558,150 @@ msgstr "Pause Av"
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Placering"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "alla skärmar"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "skärm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Tona in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Tona ut:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Teckensnitt"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Teckensnitt %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Skugga"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Färger"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Färg %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Event"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Trigger"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Test"
 
@@ -680,11 +717,11 @@ msgstr "ASXv1/ASXv2 Spellistor"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Spellistor (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Färg</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -708,15 +745,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalysator"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Ljud CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -728,120 +765,120 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Enhet</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Läshastighet:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Använd CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Använd CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Använd HTTP istället för CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ogiltig URI %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Spår %d kunde inte hittas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Spår %d är ett dataspår."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Ljud CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "Kunde inte skapa cddb-anslutning."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Kunde inte fråga CDDB-server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Kunde inte fråga CDDB-server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "Kunde inte läsa cddb-data: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
-msgstr ""
+msgstr "Enheten är tom."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "Ogiltig  typ av skiva."
 
 #: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
@@ -857,7 +894,7 @@ msgstr "Lägg till CD"
 
 #: src/compressor/compressor.cc:45
 msgid "<b>Compression</b>"
-msgstr ""
+msgstr "<b>Komprimering</b>"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
@@ -992,58 +1029,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Ta bort Filer"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Vill du flytta valda filer till papperskorgen?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Flytta till Papperskorgen"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Vill du radera valda filer permanent?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Ta Bort"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Avsluta"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Radera valda filer"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Flytta till papperskorgen istället för att ta bort direkt"
 
@@ -1081,11 +1120,11 @@ msgstr "Volym:"
 msgid "Echo"
 msgstr "Eko"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1095,15 +1134,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr ""
+msgstr "FileWriter-plugin"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Välj en mapp"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1120,194 +1155,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
-msgstr ""
+msgstr "Spara i ursprunglig katalog"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
-msgstr ""
+msgstr "Spara i katalog:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "Generera filnamn utifrån:"
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
-msgstr ""
+msgstr "Ursprungligt filnamn"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
-msgstr ""
+msgstr "Ursprungligt filnamn (utan filtyp)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr ""
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr ""
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:675
-msgid "Compression ratio:"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:484
+msgid "Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr ""
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kvalite"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
-msgstr ""
+msgstr "Använd VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR-inställningar"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
+#: src/filewriter/filewriter.cc:519
+msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:903
-msgid "VBR quality level:"
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
-msgstr ""
+msgstr "Markera som copyright"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
-msgstr ""
+msgstr "markera som orginal"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Lägg endast till v1-tag"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Lägg endast till v2-tag"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kvalite"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Taggar"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
 msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Allmänt"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC Dekoder"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1315,25 +1434,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1345,23 +1464,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME Genvägar"
@@ -1378,8 +1484,8 @@ msgstr ""
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Titel"
@@ -1436,8 +1542,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Sökverktyg"
 
@@ -1465,335 +1571,338 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Öppna filer..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Öppna _URL ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Lägg till filer ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Lägg till U_RL ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "O_m ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Inställningar ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Spela"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Paus_a"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Stoppa"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "Förra"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Nästa"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "Låtinformation"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Ny"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Importera"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Exportera"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Volym _Upp"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Volym _Ner"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Effekter ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Fil"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Spellista"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_Services"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Visa"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Klistra in"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Välj _Alla"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "_Döp om ..."
 
@@ -1834,58 +1943,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Buffrar ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanal "
 msgstr[1] "%d kanaler"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr ""
 
@@ -1893,9 +2001,9 @@ msgstr ""
 msgid "Previous track"
 msgstr "Förra låten"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Spela"
 
@@ -1903,8 +2011,8 @@ msgstr "Spela"
 msgid "Pause/Resume"
 msgstr "Pausa/Fortsätta"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Stoppa"
 
@@ -1998,7 +2106,7 @@ msgstr ""
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Globala snabbtangenter"
 
@@ -2017,35 +2125,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2128,48 +2236,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Inga sångtexter tillgängliga"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Fel"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "Redigera sångtexter ..."
 
@@ -2181,17 +2289,17 @@ msgstr "M3U Spellistor"
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2339,15 +2447,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b> Avancerat </ b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2359,35 +2467,35 @@ msgstr "MPRIS 2 Server"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Okänt HTTP-fel"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2407,15 +2515,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Visa uppspelningskontroller"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2423,21 +2531,21 @@ msgstr ""
 msgid "Show"
 msgstr "Visa"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Pause"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Nästa"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 Utgång"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 Utgång"
 
@@ -2474,23 +2582,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2502,35 +2610,34 @@ msgstr "PLS Spellistor"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Avkodare"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio Utgång"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Utgång"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2539,47 +2646,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "Arbetar ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Sök"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "_Öppna Mapp ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "_Lägg till Mapp"
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "Öppna filer"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "Lägg till filer"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Förra"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Upprepa"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Blanda"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "_Öppna Mapp ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "_Lägg till Mapp"
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt Interface"
 
@@ -2621,7 +2745,7 @@ msgstr ""
 msgid "Method:"
 msgstr "Metod:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr ""
 
@@ -2673,52 +2797,41 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Nätverksproblem"
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Kontrollerar..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2742,17 +2855,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL Utgång"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2760,68 +2873,68 @@ msgstr ""
 "SDL Utgång Plugin för Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Bibliotek"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "på"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "av"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Vänligen vänta ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Välj Mapp"
 
@@ -2915,15 +3028,15 @@ msgstr ""
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2975,373 +3088,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "Visualiseringar"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "Volym Upp"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "Volym Ner"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "Effekter ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Öppna filer..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Öppna URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "Sök bibliotek"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Uppspelning"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Spellista"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "Utgång"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Visa"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Tjänster"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Om ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Inställningar..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Låtinformation ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Hoppa till låt ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Hoppa till tid ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Ny spellista"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Döp om spellista"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Ta Bort Spellista"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Förra Spellista"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Nästa Spellista"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Importera spellista"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Exportera spellista"
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Visa Equalizer"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Lägg till URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Lägg till filer ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr ""
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Ta Bort Alla"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr ""
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr ""
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr ""
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Sortera vald"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Sortera Lista"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Klipp"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Klistra in"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3354,15 +3475,15 @@ msgstr ""
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "Öppna Mapp ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "Lägg till Mapp ..."
 
@@ -3450,7 +3571,7 @@ msgid "Slow"
 msgstr ""
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr ""
 
@@ -3582,7 +3703,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3604,66 +3725,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio Utgång"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3678,21 +3799,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "Låtinformation"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3701,43 +3822,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Status ikon"
 
@@ -3826,12 +3947,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3848,7 +3969,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3914,7 +4035,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX Dekoder"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -3924,19 +4045,29 @@ msgstr ""
 "Baserat på in_vtx.dll av Roman Sherbakov <v_soft@microfor.ru>  \n"
 "Audacious plugin av Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack Dekoder"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "lossy (hybrid)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3949,14 +4080,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Dekoder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Delbara Spellistor (XSPF)"
diff --git a/po/ta.po b/po/ta.po
index da0fbc2..aa96ab1 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,10 +9,10 @@
 # Nareshwar Raju Vaneshwar <rajnareshwar@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Tamil (http://www.transifex.com/jlindgren/audacious/language/"
 "ta/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
@@ -30,27 +30,27 @@ msgstr ""
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Player)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "அலாரம்"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr ""
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -101,147 +101,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "இது உங்களை எழுப்புவதற்கான அழைப்பு"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "நினைவூட்டி"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "திங்கட்கிழமை "
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "செவ்வாய்கிழமை "
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "புதன்கிழமை "
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "வியாழக்கிழமை "
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை "
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "சனிக்கிழமை "
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "ஞாயிற்றுகிழமை "
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "நேரம் "
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "அலாரம் அடிக்கும் நேரம் (இயல்புநிலை) :"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "பின் நிசப்தமாக்குக: "
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "மணித்தியாலங்கள் "
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "நிமிடங்கள் "
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "அலாரம் வேண்டிய நாட்களை தெரிவு செய்க "
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "நாள் "
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "இயல்புநிலை"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "நாட்கள் "
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "மங்குதல் "
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "வினாடிகள் "
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "ஒலி அளவு "
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "இங்கு ஆரம்பிக்குக "
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "இறுதி "
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "தற்போதைய "
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "மேலதிக பின்னூட்டு"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "செயல்படுத்துக "
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "பாடல் பட்டியல் (விரும்பினால் மட்டும்)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "பாடல் பட்டியலினை தெரிவு செய்க"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "விருப்பத்தேர்வுகள் "
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "இவ்விருப்ப தேர்வுகள் எதனை உணர்த்துகின்றன?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "உதவி "
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "குறுவட்டு வரைவு "
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA வெளியீடு"
 
@@ -278,11 +278,11 @@ msgstr "கலவை சாதனம்:"
 msgid "Mixer element:"
 msgstr "கலவை உறுப்பு:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-சொருகி  (MIDI இயக்கி )"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -305,68 +305,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -374,86 +374,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-சொருகி - ஒலி எழுத்துரு கோப்பினை தெரிவு செய்க "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "கோப்பின் பெயர் "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "அளவு (பயிட்ஸ்)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "பெயர்: "
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI தகவல் </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "வடிவமைப்பு: "
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "நீளம் (மில்லி வினாடிகள்): "
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "பாடல்களின் இலக்கங்கள்:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "மாறி "
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு: "
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு (wavg): "
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "நேரப் பிரிவு:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI பின்னூட்டுகள் மற்றும் பாடல் வரிகள் </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பின்னூட்டும் கிடைக்கப்படவில்லை * "
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை * "
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_மூடவும்"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "(செல்லுபடியற்ற UTF-8 )"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -465,7 +479,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr " AOSD ( திரையில் தோன்றும் காட்சி)"
 
@@ -517,94 +531,94 @@ msgstr "இடைநிறுத்தத்தை நிறுத்துக"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "மீளியக்கம் நிறுத்தப்படுகையில் திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது. "
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "ஒன்றின் நிறுத்தப்பட்ட நிலை "
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "ஒப்பீட்டு X விலக்கம்:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "ஒப்பீட்டு Y விலக்கம்: "
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "அதிகூடிய  திரையில் தோன்றும் காட்சியின் அகலம்:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "பல்-கணினித்திரை தேர்வுகள் "
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "திரையில் தோன்றும் காட்சியினை காட்டுக இதனை பயன்படுத்தி: "
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "அனைத்து கணினித்திரைகள் "
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "கணினித்திரை %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "நேரம் (மில்லி வினாடிகளில்) "
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "காட்சிப்படுத்துக:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "உண்மங்கியடைதல்:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "வெளிமங்குதல்:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "எழுத்துருக்கள் "
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "எழுத்துரு %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "நிழல் "
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "வழங்கும் பாங்கு "
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "நிறங்கள் "
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "நிறம் %i "
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "தூண்டுதலினை செயல்படுத்துக "
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "நிகழ்வு "
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "தொகுப்பு நிர்வாகி கண்டறியப்பட்டது"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -615,60 +629,56 @@ msgstr ""
 "கட்டாயமாக தொகுப்பு நிர்வாகியொன்று செயற்படுத்தப்பட வேண்டும். இல்லையெனில் திரையில் "
 "தோன்றும் காட்சி ஒழுங்காக இயங்காது. "
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "போலி வெளிப்படைத்தன்மையிற்கு தொகுப்பு நிர்வாகியொன்று தேவையில்லை "
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "வெளிப்படைத்தன்மை "
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "போலி வெளிப்படைத்தன்மை "
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "உண்மையான வெளிப்படைத்தன்மை ( X தொகுப்பு நீடிப்பு தேவைப்படுகிறது.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "தொகுப்பு நீட்டிப்பு ஏற்றப்படவில்லை "
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "தொகுப்பு நீட்டிப்பு காணப்படவில்லை "
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>ஔடகிவஸ் திரையில் தோன்றும் காட்சி </span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "இடம் "
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "உயிரூட்டுதல் "
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "எழுத்து "
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "அலங்காரம் "
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "தூண்டுதல் "
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "மற்றவை"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -684,11 +694,11 @@ msgstr "ASXv1/ASXv2 பாடல் பட்டியல் "
 msgid "Audacious Playlists (audpl)"
 msgstr "ஔடகிவஸ் பாடல் பட்டியல்கள் "
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>நிறம்</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "மங்கலான குறியிலக்கம்"
 
@@ -712,15 +722,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr "குறை அதிர்வெண்:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "நிறமாலை பகுப்பாய்வி "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "ஒலி இறுவட்டு சொருகி"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -732,118 +742,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>சாதனம்</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "வாசிக்கும் வேகம் :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "சாதனம் மேலெழுது:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>மீத்தரவு </b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "இறுவட்டு எழுத்துகளை உபயோகிக்க"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "CDDB இனை உபயோகிக்க"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP இற்கு பதிலாக HTTP இனை பயன்படுத்துக "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "சேவையகம்:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "வழி :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "போர்ட் :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "ஒலி இறுவட்டு"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "வட்டு வெறுமையாக உள்ளது."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "ஆதரவற்ற வட்டு வகை."
 
@@ -996,58 +1006,60 @@ msgstr "அடர்த்தி:"
 msgid "Crystalizer"
 msgstr "palinguruvaathal"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "கோல் தாள் செருகுநிரல்"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "அழிக்குக "
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "ரத்து செய்க "
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1085,11 +1097,11 @@ msgstr "ஒலி அளவு "
 msgid "Echo"
 msgstr "எதிரொலி "
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg நீட்சி"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1099,15 +1111,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter நீட்சி "
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "ஒரு கோப்புறையை தேர்ந்தெடுக்கவும்"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1124,194 +1132,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "வெளியீட்டு கோப்பு வடிவம்:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "அசல் கோப்பகத்தில் சேமிக்கவும்"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "பொதுவான"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "தானியங்கு"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "கூட்டு பேரொலி"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "பேரொலி"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "ஒற்றை"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "படிமுறை தரம்:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "பிட்வீதம் (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "அழுத்த விகிதம்:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "ஒலி முறைமை:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "தவறு பாதுகாப்பு"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "தரம் "
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR இனை செயல்படுத்துக "
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "வகை:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR தேர்வுகள்:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "அதிகுறைந்த பிட்வீதம் (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "அதிகூடிய பிட்வீதம் (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "கண்டிப்பாக குறைந்த பிட்வீதத்தை செயல்படுத்துக "
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR தேர்வுகள்:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "சராசரி பிட்வீதம் (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR தர நிலை:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "கண்டிப்பாக குறைந்த பிட்வீதத்தை செயல்படுத்துக "
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "பதிப்புரிமை என குறிக்குக "
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "அசலென குriக்குக"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "பதிப்பு 2 குறியை பலமாக உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "பதிப்பு 1 குறியை மாத்திரம் உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "பதிப்பு 2 குறியை மாத்திரம் உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "தரம் "
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "குறி "
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "தரம் (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "பொதுவான"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC குறிவிலக்கி "
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1319,25 +1411,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO நீட்சி"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1349,23 +1441,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL நிறமாலை பகுப்பாய்வி"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1382,8 +1461,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "பதிவு எண்"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "தலைப்பு"
@@ -1440,8 +1519,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "தேடல் கருவி"
 
@@ -1469,335 +1548,338 @@ msgstr "தரையிறக்க வேண்டாம் "
 msgid "Disable"
 msgstr "முடக்குக "
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_கோப்புக்களைத் திற ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "முகவரியை_திற ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "கோப்புக்களை _சேர் ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "முகவரியை சேர் ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "பற்றி ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_விலகு "
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_இயக்குக "
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_இடைநிறுத்து"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_நிறுத்துga"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_முந்தைய"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_அடுத்து "
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_மறுபடியும்"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "குலுக்குக "
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "முன்னோக்கிய பாடல் பட்டியல் alla"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "பாடல் தகவல் "
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "_நேரத்திற்கு தாவவும் "
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "பாடலுக்கு _தாவவும்"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "_தலைப்பு  அடிப்படையில்"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "பாடல் _இலக்க அடிப்படையில்  "
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_பாடகர்  அடிப்படையில்"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "வெளியிட்ட திகதி அடிப்படையில்"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "_கோப்பு வழி அடிப்படையில்"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "_விருப்ப தலைப்பு அடிப்படையில்"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "தலைகீழ் ஒழுங்கு"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_தற்போக்கு ஒழுங்கு"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_புதுப்பிக்குக "
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_வரிசைப்படுத்துக "
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "_கிடைக்கப்பெறாத கோப்புகளை அகற்றுக"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_புதிய "
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_இறக்குமதி ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_ஏற்றுமதி ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "_வரிசை நிர்வாகி ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "ஒலிஉரப்பான் _அதிகரிக்குக "
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "ஒலிஉரப்பான் _குறைக்குக "
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "_பட்டியல் பட்டியை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "தகவல் பட்டியை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "தகவல் பட்டி காட்சியாக்கத்தை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "_நிலைமை பட்டியை காண்பிக்குக"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "கோப்பு "
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_மீள்இயக்குக "
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "பாடல் பட்டியல் "
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "_சேவைகள் "
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "_வெளியீடு"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_paarvayiduga"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_வரிசைப்படுத்துக/வரிசைப்படுத்தலை அகற்றுக "
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "வெட்டுக "
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "நகலெடுக்க "
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_ஒட்டவும்"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "_அனைத்தையும் தேர்ந்தெடுக்குக "
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "மறுபெயர்"
 
@@ -1838,58 +1920,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK இடைமுகம் "
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - ஔடகிவஸ்"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "இடைநிலைப்படுத்துகிறது ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "ஔடகிவஸ்"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "தனித்த "
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "ஒலிப்பிரிப்பு"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "ஒற்றை முறை."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "பாடல் பட்டியல் murai"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "பாடலின் பின்னர் நிறுத்துக."
 
@@ -1897,9 +1978,9 @@ msgstr "பாடலின் பின்னர் நிறுத்துக.
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "இயக்குக "
 
@@ -1907,8 +1988,8 @@ msgstr "இயக்குக "
 msgid "Pause/Resume"
 msgstr "இடைநிறுத்து / மீண்டும் இயக்கு "
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "நிறுத்துக "
 
@@ -2007,7 +2088,7 @@ msgstr "<b>சாவி பிணைத்தல்:</b>"
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "உலகளாவிய குறுக்குவிசைகள்:"
 
@@ -2026,35 +2107,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK வெளியீடு "
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2141,48 +2222,48 @@ msgstr "LIRC சேவைகயத்துக்கு மீள் இணை�
 msgid "Wait before reconnecting:"
 msgstr "மீள் இணைக்க முன் பொறுக்க :"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki நீட்சி "
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை "
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "thavaruthal"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2194,17 +2275,17 @@ msgstr "M3U பாடல் பட்டியல்"
 msgid "Tact Generator"
 msgstr "திறமை பிறப்பாக்கி"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "திறமை பிறப்பாக்கி:% d நிமிடத்திற்கான துடிப்புகள் "
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "திறமை பிறப்பாக்கி:%d நிமிடத்திற்கான துடிப்புகள் %d %d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2352,15 +2433,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "MPG123 நீட்சி"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "சூழ்ந்த"
 
@@ -2372,35 +2453,35 @@ msgstr "MPRIS 2 சேவையகம் "
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS நீட்சி "
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "நிறுத்துப்பட்டது "
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "ஔடகிவஸ் இயங்கவில்லை "
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "பணிமேடை அறிவிப்புகள்"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2420,15 +2501,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2436,21 +2517,21 @@ msgstr ""
 msgid "Show"
 msgstr "காண்பிக்குக "
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "இடைநிறுத்துக "
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "அடுத்தது "
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 வெளியீடு "
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2487,23 +2568,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2515,35 +2596,34 @@ msgstr "PLS பாடல் பட்டியல்"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 குறிவிலக்கி "
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio வெளியீடு "
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2552,47 +2632,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "முந்தைய"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "மறுமுறை"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "குலுக்குக "
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2634,7 +2731,7 @@ msgstr "<b> பரிமாற்றம் </b>"
 msgid "Method:"
 msgstr "முறைமை "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "வீதம்:"
 
@@ -2686,52 +2783,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr "192 kHz: "
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "வலையமைப்பு சிக்கல் "
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "சரிபார்க்கப்படுகிறது "
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2755,74 +2841,74 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL வெளியீடு "
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "நூலகம்"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "பாடல் பட்டியலொன்றை _உருவாக்குக "
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "பாடல் பட்டியலிற்கு _சேர்க்க "
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "நூலகத்தில் தேடுக "
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2830,11 +2916,11 @@ msgstr ""
 "ஔடகிவஸ் இல் இசை நூகலமொன்றை இறக்குமதி செய்ய கோப்பகமொன்றை தெரிவு செய்து புதுப்பிப்பு "
 "பொத்தானை அழுத்துக. "
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "தயவு செய்து பொருத்திருக்குக ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "கோப்பகமொன்றை தேர்க "
 
@@ -2928,15 +3014,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2988,373 +3074,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "ஔடகிவஸ் சமமாக்கி "
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "%d:%-2.2d / %d:%-2.2d இனை நாடுக"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "ஒலி அளவு: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "சமநிலை:% d%% இடது"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "சமநிலை:மத்தி "
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "சமநிலை:% d%% வலது "
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "தேர்வு பட்டியல்"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "'எப்போதும் மேலே' என்பதை முடக்குக "
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "'எப்போதும் மேலே' என்பதை செயற்படுத்துக "
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "கோப்பு தகவல் பெட்டி"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "மீள் இயக்கு"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "பாடல் பட்டியல்"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "பார்வையிடுக "
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "முன்னோக்கிய பாடல் பட்டியலுக்கு செல்ல வேண்டாம்"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr ""
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "புதிய பாடல் பட்டியல்"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "பாடல் பட்டியல் திருத்தியை காண்பிக்க "
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "சமமாக்கியை காண்பிக்க "
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "எப்பொழுதும் மேலே "
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "தலைப்பின் படி "
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "அனைத்தையும் அகற்றுக. "
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "வரிசையினை அழிக்குக. "
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "கிடைக்கப்பெறாத கோப்புகளை அகற்றுக. "
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "போலிகளை அகற்றுக "
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "தெரிவுசெய்யாதவற்றை அகற்றுக. "
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "தெரிவுசெய்தவற்றை அகற்றுக"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "தேடி தேர்ந்தெடுக்கவும்"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "தலைகீழ் தேர்ந்தெடுப்பு"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "எதனையும் தேர்ந்தெடுக்க வேண்டாம்."
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "அனைத்தையும் தேர்ந்தெடுக்குக "
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "பாடல் இலக்க அடிப்படையில்  "
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "பாடகர்களின் படி "
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "குறுவட்டின் படி "
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "பட்டியலினை தற்போக்காக தோன்றச்செய்க "
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "பட்டியலினை தலைகீழாக்குக"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "வரிசையானவற்றை தெரிக."
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "பட்டியலை வரிசையாக்குக "
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "வெட்டுக "
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "நகleடுக்குக"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "ஒட்டுக "
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3367,15 +3461,15 @@ msgstr "ஔடகிவஸ் பாடல் பட்டியல் திர
 msgid "%s (%d of %d)"
 msgstr "%s (%d இன் %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp பாரம்பரிய இடைமுகம்"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3463,7 +3557,7 @@ msgid "Slow"
 msgstr "மெதுவாய் "
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "நடுத்தரம் "
 
@@ -3598,7 +3692,7 @@ msgstr "தேர்வடையும் பதிவுகளுக்கு �
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3620,66 +3714,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "பாடல் மாற்றம் "
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3694,21 +3788,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3717,43 +3811,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "விரைவு "
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "குறைவு "
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "உயர்"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "மிக உயர் "
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "தரம்:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "வேகம்:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "சுருதி:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr ""
 
@@ -3839,12 +3933,12 @@ msgstr "<b>கூடுதல் பேரொலி </b>"
 msgid "Tone Generator"
 msgstr "ஒலி  உருவாக்கி "
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "தொனி பிறப்பாக்கி:"
 
@@ -3861,7 +3955,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "குரல் நீக்கம்"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3910,26 +4004,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3940,14 +4044,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 47e6234..30eeaa5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -23,10 +23,10 @@
 # Volkan Gezer <volkangezer@gmail.com>, 2013,2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
 "Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Turkish (http://www.transifex.com/jlindgren/audacious/"
 "language/tr/)\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC(Raw) Çözücü"
 
@@ -44,27 +44,27 @@ msgstr "AAC(Raw) Çözücü"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug(AdLib Oynatıcı)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Alarm ayarla..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -115,147 +115,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Bu uyandırma çağrısıdır."
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Bugünkü hatırlatıcınız..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Hatırlatıcı"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Salı"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "Cuma"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Pazar"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Zaman"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Alarm (Varsayılan)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Sonra sessiz:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "saat"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "dakika"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Sonraki alarm için günleri seçiniz"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "Gün"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Günler"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Bozulma"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "saniye"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Ses"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "İle başla"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "Son"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Şu anda"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Ek Komut"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "izin ver"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Çalma Listesi(isteğe bağlı)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Çalma listesi Seç"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Bu ayarlar ne anlama geliyor?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Yardım"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Albüm kapağı"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA Çıktısı"
 
@@ -292,11 +292,11 @@ msgstr "Karıştırıcı aygıt:"
 msgid "Mixer element:"
 msgstr "Karıştırıcı öğesi:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -319,68 +319,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -388,86 +388,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont dosyası seç"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Boyut (bayt)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI Bilgisi </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Biçim:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Uzunluk (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "değişken"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Zamanı Böl:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI Yorumları ve Sözleri </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* bu midi dosyasında yorum bulunamadı *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* bu midi dosyasında şarkı sözü bulunamadı *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Kapat"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (geçersiz UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -479,7 +493,7 @@ msgid ""
 "http://neugierig.org/software/ghosd/"
 msgstr ""
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr ""
 
@@ -531,94 +545,94 @@ msgstr "Bekletme Kapalı"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Çalmaya yeniden başladığında OSD'yi başlatır."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Yerleştirme"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Değişken X değeri:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Değişken Y değeri:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Maksimum OSD genişliği:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Çoklu Ekran seçenekleri"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD kullanımını göster:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "tüm ekranlar"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "ekran %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Zamanlama (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Görüntü:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Gecikme:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Kaybolma:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Yazı tipi %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Gölge"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Tarama Biçemi"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Renkler %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Tetikleyiciyi etkinleştir"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Olay"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Composite yöneticisi tespit edildi"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -628,60 +642,56 @@ msgstr ""
 "Çalışan bir Composite yöneticisinin olduğundan emin değilseniz lütfen "
 "OSD'nin düzgün çalışması için bir Composite yöneticisi çalıştırınız"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Sahte şeffaflık için composite yöneticisi gerekli değil"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Şeffaflık"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Sahte şeffaflık"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Gerçek Şeffaflık (X Composite Eklentisi gerekli)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite eklentisi yüklü değil"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite eklentisi erişilebilir değil"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Konum"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Canlandırma"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Metin"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Dekorasyon"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Başlat"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr ""
 
@@ -697,11 +707,11 @@ msgstr ""
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Renk</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr ""
 
@@ -725,15 +735,15 @@ msgstr ""
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,118 +755,118 @@ msgid ""
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP yerine HTTP kullan"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Ses CD'si"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Sürücü boş."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Desteklenmeyen disk türü."
 
@@ -1009,58 +1019,60 @@ msgstr ""
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Dosyaları Sil"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Çöp kutusuna taşı"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Seçilen dosyaları kalıcı olarak silmek istiyor musunuz?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Sil"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Seçilen Dosyaları Sil"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1098,11 +1110,11 @@ msgstr ""
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1112,15 +1124,11 @@ msgid ""
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Dizin seçimi"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1137,194 +1145,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Çıktı dosya biçimi:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Orjinal dizine kaydet"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Genel"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Otomatik"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Birleşik Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Algoritma Kalitesi:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Bit oranı (kbps):"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Sıkıştırma oranı:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
-msgstr "Ses Kipi:"
-
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "Hata koruması"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Kalite"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR etkinleştir"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR Seçenekleri:"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "En düşük bit oranı (kbps):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "En yüksek bit oranı (kbps):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "En düşük bit oranını tam olarak zorla"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR Seçenekleri:"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Ortalama bit oranı (kbps):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR kalite seviyesi:"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "En düşük bit oranını tam olarak zorla"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "Telif hakkı olarak işaretle"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "Orijinal olarak işaretle"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "sürüm 2 etkiketin eklenmesini zorla"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Sadece v1 etiketini ekle"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Sadece v2 etiketini ekle"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Kalite"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Etiketler:"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Kalite seviyesi (0 - 10):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Genel"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "kayıpsız"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1332,25 +1424,25 @@ msgid ""
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1362,23 +1454,10 @@ msgid ""
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1395,8 +1474,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Sayı girin"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Başlık"
@@ -1453,8 +1532,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Arama Aracı"
 
@@ -1482,335 +1561,338 @@ msgstr "Çıkar"
 msgid "Disable"
 msgstr "Devre Dışı"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "_Dosya Aç ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "URL _Aç ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "U_RL Ekle ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "H_akkında"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Çık"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Oynat"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Duraklat"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "D_urdur"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "_Önceki"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Sonraki"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "_Tekrarla"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "_Karıştır"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Şarkı Bilgisi ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Süre Atla"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Şarkı Atla"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Tekrarlama Başlancığı _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Tekrarlama Sonu _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Tekrarlama Noktalarını Sil"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "_Başlığa Göre"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "_Dosya Yoluna Göre"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "Parça_Numarasına Göre"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "_Sanatçıya Göre"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "Yayın Tarihi"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "Özel Başlık"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "_Rastgele Sipariş"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Yenile"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Tür"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Yeni"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Yükle ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Çıkart ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Sıra Yöneticisi ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "Sesi_Arttır"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "Sesi_Azalt"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Menü_Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Bilgi Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Durum Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Oynatma"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "Çalma Listesi"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "Servisler"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "Çıktı"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "_Görünüm"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "Ke_s"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Tümünü_Seç"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr ""
 
@@ -1851,58 +1933,57 @@ msgstr ""
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK Arayüzü"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Çalma Listesi modu"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Şarkıdan sonra duruyor."
 
@@ -1910,9 +1991,9 @@ msgstr "Şarkıdan sonra duruyor."
 msgid "Previous track"
 msgstr "Önceki parça"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Çal"
 
@@ -1920,8 +2001,8 @@ msgstr "Çal"
 msgid "Pause/Resume"
 msgstr "Ara ver/Devam et"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Dur"
 
@@ -2015,7 +2096,7 @@ msgstr ""
 msgid "_Add"
 msgstr "_Ekle"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr ""
 
@@ -2034,35 +2115,35 @@ msgid ""
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "Jack Çıkış baglantısı"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Jack girişine baglantı saglanamadı %s.."
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2145,48 +2226,48 @@ msgstr ""
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Hata"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2198,17 +2279,17 @@ msgstr ""
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt oluşturucu: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt oluşturucu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2356,15 +2437,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Gelişmiş</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Surround"
 
@@ -2376,35 +2457,35 @@ msgstr ""
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Durdu"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious oynatmıyor."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2424,15 +2505,15 @@ msgid ""
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Her zaman bildirim göster"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2440,21 +2521,21 @@ msgstr ""
 msgid "Show"
 msgstr "Göster"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Duraklat"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Sonraki Parça"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2491,23 +2572,23 @@ msgid ""
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "Çalma Listesi Düzenleyici"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "Girdiler"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "_Sil"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2519,35 +2600,34 @@ msgstr ""
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2556,47 +2636,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
-msgid "Search"
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
+#: src/qtui/dialog_windows.cc:31
+msgid "Working ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
+#: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
+msgid "Search"
 msgstr ""
 
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Önceki Parça"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Tekrar et"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Karıştır"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2638,7 +2735,7 @@ msgstr "<b>Çeviri</b>"
 msgid "Method:"
 msgstr "Metot:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Derece:"
 
@@ -2690,53 +2787,41 @@ msgstr ""
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Ağ Sorunu."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr ""
-"Last.fm ile iletişimde bir sorun var. Lütfen daha sonra tekrar deneyin."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
@@ -2760,84 +2845,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr ""
 
@@ -2931,15 +3016,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr ""
 
@@ -2991,373 +3076,381 @@ msgstr ""
 msgid "Audacious Equalizer"
 msgstr "Audacious Ekolayzır"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Zıpla %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Ses: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Seçenekler Menüsü"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Devre dışı bırak 'Her Zaman Görünür' "
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Etkinleştir 'Her Zaman Görünür' "
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Dosya Aç ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "URL Aç ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Çal"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Parça Listesi"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Görünüm"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Hizmetler"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Hakkında ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Ayarlar ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Şarkı Bilgisi ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Şarkıdan Sonra Durdur"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Yeni Çalma Listesi"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Çalma Listesini Yeniden Adlandır"
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Çalma Listesini Kaldır"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Önceki Çalma Listesi"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Sonraki Çalma Listesi"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Çalma Listesi İçe Aktar"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Çalma Listesi Dışa Aktar"
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Çalma Listesi Yöneticisi"
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Kuyruk Yöneticisi"
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Çalma Listesini Yenile"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Her Zaman Üstte"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr ""
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Tümünü Sil"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Bulunamayan Dosyaları Sil"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Birden Fazla Olanı Sil"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Seçilenleri Kaldır"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Ara ve Seç"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Hiçbiri Seçilmedi"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Tümünü_Seç"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr ""
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Rastgele Listele"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Kısa Liste"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Kes"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr ""
 
@@ -3370,15 +3463,15 @@ msgstr ""
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3466,7 +3559,7 @@ msgid "Slow"
 msgstr "Yavaş"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Orta"
 
@@ -3598,7 +3691,7 @@ msgstr ""
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3620,66 +3713,66 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Şarkıyı değiştir"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3694,21 +3787,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3717,43 +3810,43 @@ msgid ""
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Hızlı"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Düşük"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Yüksek"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Daha Yüksek"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Kalite:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Hız:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr ""
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Durum iconu"
 
@@ -3839,12 +3932,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Ton Oluşturucu: "
 
@@ -3861,7 +3954,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Ses yok etme"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3910,26 +4003,36 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTC Çözücü"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Wav Çözücü"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -3940,14 +4043,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF Çözücü"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Paylaşılabilir müzik listesi (XSPF)"
diff --git a/po/uk.po b/po/uk.po
index 697cae8..431527e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,6 +4,7 @@
 #
 # Translators:
 # Dennis <tymbood@gmail.com>, 2014-2015
+# Eugene Paskevich <eugene@raptor.kiev.ua>, 2016
 # Kostyantyn Fedenko <fedenko@ukr.net>, 2011
 # Kostyantyn Fedenko <fedenko@ukr.net>, 2011
 # Oleg <kvantarium@gmail.com>, 2012
@@ -17,13 +18,14 @@
 # Rustam Tsurik <rustam.tsurik@gmail.com>, 2013
 # Oleg <kvantarium@gmail.com>, 2012
 # Yuri Chornoivan <yurchor@ukr.net>, 2012
+# Олександр Сенін <aleniksenin@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-08-25 17:16+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-24 20:22+0000\n"
+"Last-Translator: Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/jlindgren/audacious/"
 "language/uk/)\n"
 "Language: uk\n"
@@ -33,7 +35,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "Декодер AAC (Raw)"
 
@@ -41,20 +43,20 @@ msgstr "Декодер AAC (Raw)"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (програвач AdLib)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "послідовний"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "Будильник"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "Встановити Будильник..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -64,7 +66,7 @@ msgstr ""
 "\n"
 "Автори плаґіну-оригіналу: Adam Feakin, Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -115,147 +117,147 @@ msgid ""
 "    the checkbox if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "Вставай, Україно! Вставай, рідна ненько! Москаль вже годину не спить!"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "Нагадування на сьогодні..."
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "Повідомлення"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "Понеділок"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "Середа"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "Четвер"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "П’ятниця"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "Неділя"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "Час"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "Починати о (типово):"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr " г"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "Закінчити через:"
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "год"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "хв"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "Налаштуйте дні тижня, в які працюватиме будильник."
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "День"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "Як типово"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "Дні"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "Наростання"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "сек"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "Гучність"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "На початку:"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "По закінченню:"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "Як зараз"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "Виконувати команду"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "увімкнути"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "Список відтворення (необов’язково)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "Обрати список відтворення"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "Опції"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "Як це все налаштувати?"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "Як налаштувати?"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "Обкладинка альбому"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-вивід"
 
@@ -297,11 +299,11 @@ msgstr "Мікшер:"
 msgid "Mixer element:"
 msgstr "Елемент мікшера:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-програвач)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -324,68 +326,68 @@ msgid ""
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Змінити типовий підсилювач на:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Змінити типову поліфонію на:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Змінити типову реверберацію:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Увімк."
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Змінити типовий хор:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>Відтворення</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Транспозиція: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
-msgstr ""
+msgstr "напівтони"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Зсув ударних: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>Шрифт</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>Синтезатор</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -393,86 +395,100 @@ msgstr ""
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - вибір файлу SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "_Відкрити"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "Назва файлу"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "Розмір (у байтах)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> Інформація MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "Тривалість (мс):"
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "Кількість доріжок:"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "змінна"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "Темп (BMP):"
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "Часовий код MIDI:"
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> Коментарі й слова пісні в MIDI </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* у цьому MIDI-файлі немає коментарів *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* у цьому MIDI-файлі немає слів пісні *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "_Закрити"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (недійсний UTF-8)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -491,7 +507,7 @@ msgstr ""
 "Частково заснована на бібліотеці Ghosd від Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD-сповіщення"
 
@@ -543,94 +559,94 @@ msgstr "Продовження"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показує повідомлення при продовженні відтворення."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "Розташування"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "Відносний горизонтальний зсув:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Відносний вертикальний зсув:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "Максимальна ширина повідомлення:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "Опції для кількох моніторів"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "Показувати на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "всіх моніторах"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "моніторі %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "Часова витримка (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "Показ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "Поява:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "Зникнення:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "Тінь"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "Показати стиль"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "Колір %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "Задіяти спусковий гачок"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "Подія"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "Композитний "
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -640,60 +656,56 @@ msgstr ""
 "Якщо він не запущений, увімкніть його, інакше екранне меню працюватиме "
 "неправильно."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитний менеджер не потрібен для фальшивої прозорості"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "Прозорість"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "Фальшива прозорість"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Справжня прозорість (потребує композитні розширення X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Композитне розширення вимкнене"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитне розширення недоступне"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>OSD-повідомлення Audacious</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "Розташування"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "Анімація"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "Оздоблення"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "Спусковий гачок"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "Різне"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "Тест"
 
@@ -709,11 +721,11 @@ msgstr "ASXv1/ASXv2-списки відтворення"
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки відтворення Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>Колір</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "Осцилоскоп"
 
@@ -731,21 +743,21 @@ msgstr "Рівень змішування каналів:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Частота зрізу:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "Стовпці (аналізатор спектру)"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "Плаґін аудіодисків"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -765,118 +777,118 @@ msgstr ""
 "\n"
 "Цей проект брав участь у Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>Пристрій</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "Швидкість читання:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "Перевизначення пристроїв:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Метадані</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "Використовувати CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "Використовувати CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "Використовувати HTTP замість CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "Не вдалося задіяти підсистему cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Хибне посилання: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "Доріжки %d не знайдено."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Доріжка %d — не музичні дані."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "Стався збій при читанні аудіодиску."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "Аудіодиск"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не вдалося відкрити CD-пристрій %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "Не знайдено CD-пристрою з підтримкою аудіо."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Не вдалося задіяти відкритий CD-привід."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "Не вдалося отримати номер першої/останньої доріжки."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не вдалося прочитати LSN початку/кінця доріжки %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "Не вдалося з’єднатися з cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "Не вдалося запитати сервер CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Не вдалося запитати сервер CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Не вдалося прочитати інформацію CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "Привід порожній."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "Непідтримуваний тип диску."
 
@@ -1035,58 +1047,60 @@ msgstr "Інтенсивність:"
 msgid "Crystalizer"
 msgstr "Кристалізатор"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Плаґін cue-листів"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "Видалення файлів"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "Помилка при переміщенні %s в смітник: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "Помилка при видаленні %s: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "Помилка при видаленні %s: це не локальний файл."
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "Ви хочете перемістити вибрані файли до смітника?"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "Перемістити до смітника"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "Ви хочете безповоротно видалити вибрані файли?"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "Видалити вибрані файли"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>Метод Видалення</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "Перемістити до смітника замість видалення відразу"
 
@@ -1124,11 +1138,11 @@ msgstr "Гучність:"
 msgid "Echo"
 msgstr "Відлуння"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "Плаґін FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1146,15 +1160,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Плаґін запису у файл"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "Вибір теки виводу"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1171,194 +1181,278 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "Тип файлу виводу:"
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "Зберігати в теку оригіналу"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
-msgstr ""
+msgstr "Зберегти до обраної теки:"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "Загальне"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "Авто"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Гц"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Гц"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Гц"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Гц"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Гц"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Гц"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Гц"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Гц"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Гц"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 кб/с"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 кб/с"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 кб/с"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 кб/с"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 кб/с"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 кб/с"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 кб/с"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 кб/с"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 кб/с"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 кб/с"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 кб/с"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 кб/с"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 кб/с"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 кб/с"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 кб/с"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 кб/с"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "Об’єднане стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "Швидкість стиснення:"
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Гц)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "Бітрейт (Кбіт/с)"
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "Бітрейт:"
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "Коефіцієнт стиснення:"
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "Тип звуку:"
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Примусова відповідність до ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "CRC-захист від збоїв (дещо менша якість)"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "Якість"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "Увімкнути змінний чи усереднений бітрейт"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "Тип бітрейту:"
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "Опції VBR (змінний бітрейт):"
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "Мінімальний бітрейт (Кбіт/c):"
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимальний бітрейт (Кбіт/c):"
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "Примусово встановити мінімальний бітрейт"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "Опції ABR (усереднений бітрейт):"
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "Середній бітрейт (Кбіт/с):"
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "Рівень якості VBR (менше - краще):"
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "Примусово встановити мінімальний бітрейт"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "«Під авторськими правами»"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "«Є оригіналом»"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
 msgstr ""
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "Примусово додавати теґ другої версії"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "Додавати лише v1-теґ"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "Додавати лише v2-теґ"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "Якість"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "Теґи"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "Рівень якості (0-10, менше - краще):"
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "Загальне"
+
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "без втрат"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1370,7 +1464,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1378,19 +1472,19 @@ msgstr ""
 "Плаґін GIO,\n"
 "написаний Джоном Ліндґреном у 2010–2012 роках."
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Плаґін GIO"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1410,23 +1504,10 @@ msgstr ""
 "\n"
 "Ліцензія: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL аналізатор спектру"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr ""
@@ -1443,8 +1524,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "Номер у списку"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "Назва"
@@ -1501,8 +1582,8 @@ msgstr "Доступні колонки"
 msgid "Displayed columns"
 msgstr "Відображені колонки"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "Пошуковий інструмент"
 
@@ -1530,335 +1611,338 @@ msgstr "Відкріпити"
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "Відтворити _файли..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "Відтворити файли за _посиланням..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "_Додати файли..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "Додати файли _за посиланням..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "Шукати в _бібліотеці"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "П_ро Audacious..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "_Налаштування ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "_Вихід"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "_Відтворити"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "_Призупинити"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "_Зупинити"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "П_опередня"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "_Наступна"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "Повто_рювати"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "В_ипадково"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr ""
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "Н_е просуватися списком"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "Зупинити після _цієї пісні"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "_Інформація про доріжку..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "Перейти до _часу..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "Перейти до _доріжки..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "Встановити точку повтору _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "Встановити точку повтору _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "_Скинути точки повтору"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "За _назвою"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "За _шляхом до файлу"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "_За номером доріжки"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "За _виконавцем"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "За а_льбомом"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "За _датою видання"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "За _тривалістю"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "За _шляхом до файлу"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "За назвою _файлу"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "_У зворотньому порядку"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "У випадковому по_рядку"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "_Відтворити/продовжити"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "_Оновити"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "_Сортувати"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "Сортувати ви_бране"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "Видалити _дублікати"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "Прибрати _недоступні файли"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "_Новий"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "Пере_йменувати..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "Видали_ти"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "_Імпортувати..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "_Експортувати..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "Керування списками _відтворення..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "Керування _чергою..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "З_більшити гучність"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "З_меншити гучність"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "Е_фекти..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "Показувати панель _меню"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "Показувати панель і_нформації"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "П_оказувати візуалізацію"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "Показувати рядок _стану"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "Показати час до _завершення"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "_Візуалізації ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "_Відтворення"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "_Список відтворення"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "С_лужби"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "В_ивід"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "Ви_гляд"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "_Елемент черги"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "_Вирізати"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "_Копіювати"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "Вст_авити"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "Виді_лити все"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "Пере_йменувати..."
 
@@ -1899,33 +1983,32 @@ msgstr "Крок перемотування стрілками:"
 msgid "Scroll on song change"
 msgstr "Прокручувати плейлист при зміні доріжки"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "Інтерфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "Буферую..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1933,25 +2016,25 @@ msgstr[0] "%d канал"
 msgstr[1] "%d канали"
 msgstr[2] "%d каналів"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
-msgstr ""
+msgstr "%d кГц"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d кб/с"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "Однодоріжковий режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "Режим списка відтворення."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "Зупинити після цієї доріжки."
 
@@ -1959,9 +2042,9 @@ msgstr "Зупинити після цієї доріжки."
 msgid "Previous track"
 msgstr "Попередня доріжка"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "Відтворити"
 
@@ -1969,8 +2052,8 @@ msgstr "Відтворити"
 msgid "Pause/Resume"
 msgstr "Призупинити/продовжити"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "Зупинити"
 
@@ -2070,7 +2153,7 @@ msgstr "<b>Прив’язка до клавіш:</b>"
 msgid "_Add"
 msgstr "_Додати"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "Гарячі клавіші"
 
@@ -2101,35 +2184,35 @@ msgstr ""
 "Jeremy Tan <nsx@nsx.homeip.net>\n"
 "також брали участь у розробці."
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK-вивід"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2230,48 +2313,48 @@ msgstr "Переприєднатись до LIRC серверу"
 msgid "Wait before reconnecting:"
 msgstr "Чекати перед перез’єднанням:"
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "Плаґін LyricWiki"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "Тексту пісні не знайдено"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "Помилка"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не вдалося отримати %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не вдалося проаналізувати %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "Шукаю текст пісні..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "Відсутні метадані пісні"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "З’єднуюся з lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr ""
 
@@ -2283,17 +2366,17 @@ msgstr "M3U-списки відтворення"
 msgid "Tact Generator"
 msgstr "Генератор такту"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такту: %d BPM"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такту: %d BPM, %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2451,15 +2534,15 @@ msgstr ""
 msgid "MPG123 Plugin"
 msgstr "Плаґін MPG123"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>Додаткові</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "Об’ємний звук"
 
@@ -2471,35 +2554,35 @@ msgstr "Сервер MPRIS 2"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плаґін Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious нічого не відтворює."
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Сповіщення"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2536,15 +2619,15 @@ msgstr ""
 "Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
 "програмою. В іншому випадку, дивіться <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "Показати елементи керування відтворенням"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "Завжди показувати повідомлення"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr ""
 
@@ -2552,21 +2635,21 @@ msgstr ""
 msgid "Show"
 msgstr "Показати"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "Призупинити відтворення"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "Наступна доріжка"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4-вивід"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2609,23 +2692,23 @@ msgstr ""
 "Дякуємо #audacious, особливо Тоні Врунові, Джонові Ліндґрену й, звісно, "
 "авторам попереднього плаґіну OSS."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr ""
 
@@ -2637,53 +2720,34 @@ msgstr "PLS-списки відтворення"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio-вивід"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Плаґін виводу PulseAudio\n"
-"\n"
-"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\n"
-"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\n"
-"другої або будь-якої новішої версії у тому вигляді, в якому її опублікував\n"
-"Фонд вільного програмного забезпечення.\n"
-"\n"
-"Програма розповсюджується зі сподіванням, що вона виявиться корисною,\n"
-"але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ "
-"ПРИДАТНОСТІ\n"
-"чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \n"
-"Зверніться до Загальної публічної ліцензії GNU за подробицями.\n"
-"\n"
-"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
-"програмою.\n"
-"Якщо ви не отримали копії, зверніться за наступною адресою:\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA"
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2692,47 +2756,64 @@ msgid ""
 "Copyright 2010 John Lindgren"
 msgstr ""
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr ""
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "Пошук"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr ""
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "Попередня доріжка"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "Повторювати"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "Випадково"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr ""
 
@@ -2776,7 +2857,7 @@ msgstr "<b>Конвертування</b>"
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "Частота:"
 
@@ -2828,60 +2909,42 @@ msgstr "176.4 кГц:"
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Ок. Скроблінг для користувача: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Відмовлено у доступі"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:27
+msgid ""
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Відвідайте наступне посилання щоб дозволити Audacious скроблінг ваших "
-"доріжок:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
 msgstr ""
-"Лишіть це вікно відкритим та ще раз натисніть 'Перевірити права доступу'.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:37
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не хвилюйтесь. Дані для скроблінгу збережені на комп’ютері.\n"
-"Вони будуть відправлені, як тільки Audacious'у буде дозволено це зробити."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблема мережі."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"Виникла проблема зі з’єднанням до Last.fm. Будь ласка спробуйте пізніше."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Перевірка..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "П_еревірити права доступу"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Видалити права доступу"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Вам потрібно дозволити Audacious скроблити доріжки у ваш акаунт на Last.fm.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2913,7 +2976,7 @@ msgstr ""
 "цього проекту.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2921,11 +2984,11 @@ msgstr ""
 "На даний час Audacious використовує покращену версію скробблера Last.fm.⏎\n"
 "Будь-ласка перевірте Налаштування для плаґіна Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-вивід"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2933,13 +2996,13 @@ msgstr ""
 "Плаґін виводу в SDL,\n"
 "написаний Джоном Ліндґреном у 2010 році."
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "Бібліотека"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -2947,7 +3010,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
@@ -2955,7 +3018,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2963,31 +3026,31 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr ""
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "_Створити список відтворення"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "_Додати до списку відтворення"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "Шукати в бібліотеці"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2995,11 +3058,11 @@ msgstr ""
 "Щоб імпортувати свою музичну бібліотеку до Audacious, виберіть теку й "
 "натисніть на значок оновлення."
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "Зачекайте..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "Вибрати теку"
 
@@ -3093,15 +3156,15 @@ msgstr ""
 msgid "dB"
 msgstr ""
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "Точки повтору скинуті."
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "Точку повтору A встановлено."
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "Точку повтору B встановлено."
 
@@ -3153,373 +3216,381 @@ msgstr "16 кГц"
 msgid "Audacious Equalizer"
 msgstr "Еквалайзер Audacious"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Перехід до %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Гучність: %d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% вліво"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "Баланс: центр"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% вправо"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "Меню опцій"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "Вимкнути відображення над іншими вікнами"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "Відображати над іншими вікнами"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "Редактор інформації про доріжку"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr ""
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr ""
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr ""
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr ""
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "Відкрити файли..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "Відкрити адресу..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr ""
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "Відтворення"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "Список відтворення"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr ""
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "Перегляд"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "Служби"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "Про ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "Налаштування ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "Вихід"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "Інформація про доріжку..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "Не просуватися у списку відтворення"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "Зупинити після цієї доріжки"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "Встановити A-B повтор"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "Скинути A-B повтор"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "Перейти до доріжки..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "Перейти до часу..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "Відтворити/продовжити"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "Новий список відтворення"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "Перейменувати список..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "Видалити список"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "Попередній список"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "Наступний список"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "Імпортувати список відтворення..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "Експортувати список відтворення..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "Керування списками відтворення..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "Керування чергою..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "Оновити список відтворення"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "Показати редактор списків відтворення"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "Показати еквалайзер"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "Показати час до завершення"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "Завжди згори"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "На всіх робочих столах"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "Згорнути плеєр"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "Згорнути редактор списку відтворення"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "Згорнути еквалайзер"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "Додати адресу..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "Додати файли..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "За назвою"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "За шляхом до файлу"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "Вилучити всі"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "Очистити чергу"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "Прибрати недоступні файли."
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "Видалити дублікати"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "Вилучити невідмічені "
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "Вилучити виділені"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "Пошук і виділення"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "Інвертувати виділення"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "Зняти виділення"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "Виділити все"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "За номером доріжки"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "За виконавцем"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "За альбомом"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "За виконавцем альбому"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "За датою видання"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "Порушити порядок"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "Обернути список"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "Сортувати виділене"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "Сортувати список..."
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "Вставити"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "В чергу/З черги"
 
@@ -3532,15 +3603,15 @@ msgstr "Редактор списків відтворення Audacious"
 msgid "%s (%d of %d)"
 msgstr "%s (%d із %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Класичний інтерфейс Winamp"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr ""
 
@@ -3628,7 +3699,7 @@ msgid "Slow"
 msgstr "Повільне"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "Помірне"
 
@@ -3763,7 +3834,7 @@ msgstr "Виділити знайдене в новий список відтв�
 msgid "Sndfile Plugin"
 msgstr "Плаґін Sndfile"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3806,66 +3877,66 @@ msgstr ""
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA"
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "Зміна доріжки"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
 msgstr ""
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3880,21 +3951,21 @@ msgid ""
 "%T: Title (unformatted)"
 msgstr ""
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Ресемплер SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3908,43 +3979,43 @@ msgstr ""
 "Базується на коді модуля Sample Rate Converter:\n"
 "Авторське право 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "Швидка"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "Низька"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "Висока"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "Дуже висока"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "Якість:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Швидкість та висота"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>Швидкість та висота</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "Швидкість:"
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "Висота:"
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Значок у лотку"
 
@@ -4036,12 +4107,12 @@ msgstr "<b>Розширене стерео</b>"
 msgid "Tone Generator"
 msgstr "Генератор тону"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор тону: "
 
@@ -4067,7 +4138,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "Видалення голосу"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4133,7 +4204,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4144,19 +4215,29 @@ msgstr ""
 "\n"
 "Плаґін для Audacious створив Павел Виметалек <pvymetalek@seznam.cz>."
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "зі втратами (гібрид)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "зі втратами"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4170,14 +4251,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML-списки відтворення (XSPF)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f3f68e0..e645169 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,11 +6,12 @@
 # 周嘉韡 <btchina@live.com>, 2013
 # Chasye <chasye@gmail.com>, 2010
 # yinsigan <ganweiliang886@gmail.com>, 2012
-# 白铭骢 <jeffbai@aosc.xyz>, 2014
-# 白铭骢 <jeffbai@aosc.xyz>, 2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2014
 # Luke <runningwaterpro@gmail.com>, 2012
 # Michael Jay Tong <michaeljayt@gmail.com>, 2013
 # Michael Jay Tong <michaeljayt@gmail.com>, 2013-2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2016
 # zhangmin <zm1990s@gmail.com>, 2013-2014
 # Luke <runningwaterpro@gmail.com>, 2012
 # shan dong <sd542927172@live.cn>, 2013
@@ -19,15 +20,15 @@
 # zhangmin <zm1990s@gmail.com>, 2013-2015
 # zhangmin <zm1990s@gmail.com>, 2013
 # 周嘉韡 <btchina@live.com>, 2013
-# 白铭骢 <jeffbai@aosc.xyz>, 2015
+# Mingcong Bai <jeffbai@aosc.xyz>, 2015
 # 蒋浩海 <jhaohai@foxmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-11-16 17:40+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-08-22 12:05+0000\n"
+"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/jlindgren/audacious/"
 "language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -36,7 +37,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 解码器"
 
@@ -44,20 +45,20 @@ msgstr "AAC (Raw) 解码器"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "连续的"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "闹钟"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "设置闹钟"
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -67,7 +68,7 @@ msgstr ""
 "\n"
 "最初由 Adam Feakin 和 Daniel Stodden 编写。"
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -161,147 +162,147 @@ msgstr ""
 "    在此框内填入备忘提醒的内容，并勾选此项以\n"
 "    使其显示。"
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "此为起床闹钟"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "你今日的备忘录是……"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "提醒器"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "星期一"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "星期五"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "时间"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "响闹钟 (默认) : "
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "点"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "静音时间："
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "小时"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "分"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "选择响闹钟的日期"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "日期"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "默认"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "日期"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "渐隐"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "开始于"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "完成于"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "当前"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "附加命令"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "启用"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "播放列表(可选)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "选择一个播放列表"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "选项"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "这些选项代表什么？"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "帮助"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "专辑封面"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 输出"
 
@@ -343,11 +344,11 @@ msgstr "混音设备"
 msgid "Mixer element:"
 msgstr "混音单元："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -389,68 +390,68 @@ msgstr ""
 "Tony Vroon\n"
 "帮助我们进行测试"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "覆盖默认增益: "
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "覆盖默认复调: "
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "覆盖默认回响: "
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "开启"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "覆盖默认和声: "
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>回放</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "转置: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "鼓移: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "音符数字"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "跳过开头的静音"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "跳过尾部静音"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>合成器</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "采样率："
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -458,86 +459,106 @@ msgstr "采样率："
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "赫兹"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 选择SoundFont文件"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "打开 (_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "文件名"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "大小(bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "名称："
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI 信息 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "长度(毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "音轨数："
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "变体"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "每分钟节拍: "
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "每分钟节拍 (wavg): "
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "时间格: "
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI备注与歌词</span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI文件不包含备注 *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI文件不包含歌词 *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (非法的UTF-8编码)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache 浏览器"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache 浏览器\n"
+"\n"
+"用于 Audacious 的 Ampache 客户端。\n"
+"\n"
+"许可：GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský 和 John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -556,7 +577,7 @@ msgstr ""
 "部分基于 Evan Martin 的 Ghosd 库:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (On-Screen Display)"
 
@@ -608,94 +629,94 @@ msgstr "恢复播放"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "恢复播放时触发OSD"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X相对位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y相对位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "最大OSD宽度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "多屏选项"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "OSD显示于："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "所有显示器"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "显示器%i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "延时(ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "显示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "字体 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "阴影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "渲染风格"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "颜色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "颜色  %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "启用触发器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "检测到混合管理器"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -704,60 +725,56 @@ msgstr ""
 "未检测到混合管理器；\n"
 "OSD无法正常工作，除非你激活混合管理器。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "假透明无需混合管理支持"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "假透明"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真透明(需要X Composite扩展)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "X Composite扩展未加载"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "X Composite扩展不可用"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "动画"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "装饰器"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "触发器"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "其它"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "测试"
 
@@ -773,11 +790,11 @@ msgstr "ASXv1/ASXv2 播放列表"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放列表 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>颜色</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "模糊范围"
 
@@ -801,15 +818,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "截止频率: "
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "频谱分析器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "音频 CD 插件"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -829,118 +846,118 @@ msgstr ""
 "\n"
 "This was a Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>设备</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "读取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "覆盖设备："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>Metadata</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "使用 CD 文本"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用HTTP代替CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "服务器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "路径："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "端口："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "初始化 cdio 子系统失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "无效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "未找到音轨 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "磁道 %d 是一个数据磁道"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "读取音频 CD 时出错。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "音频CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "打开 CD 设备 %s 失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "没有找到合适的 CD 音频驱动器。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "完成打开的 CD 驱动器初始化失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "取得第一首/最后一首音频音轨号失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "不能读取音频 %d 开始/结束的 LSN 信息。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "创建 CDDB 连接失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "查询 CDDB 服务器失败"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "查询 CDDB 服务器失败：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "读取 CDDB 信息失败：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "设备为空"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "未支持光盘类型"
 
@@ -1109,58 +1126,60 @@ msgstr "强度："
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue 表插件"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "删除文件"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "将 %s 移动至垃圾箱时出错: %s."
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "删除 %s 时出错: %s."
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "删除 %s 时出错: 不是一个本地文件。"
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "你希望将选中的文件移至垃圾箱吗？"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "移至垃圾箱"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "你希望永久删除选中的文件吗？"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "删除"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "删除选中的文件"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>删除方式</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "移动到垃圾箱而不是直接删除"
 
@@ -1202,11 +1221,11 @@ msgstr "音量："
 msgid "Echo"
 msgstr "回响"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 插件"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1223,15 +1242,11 @@ msgstr ""
 "Matti Hämäläinen <ccr@tnsp.org>\n"
 "编写"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter 插件"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "选择目录"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1257,194 +1272,278 @@ msgstr ""
 "(Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA)。"
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "输出文件格式："
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "保存到原来的目录"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "保存到自定义目录："
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "文件名生成来源："
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "原始文件名"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "原始文件名(无后缀)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "原始文件标签"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "文件名前加上音轨号"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "常规"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "自动"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "立体声"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "单声道"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "音质"
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "输出取样："
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "（赫兹）"
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "算法质量："
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "码率/压缩率："
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "比特率："
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "码率(kbps)："
-
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "压缩率："
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "音频模式："
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "杂项："
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "强制严格遵从ISO"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "错误保护"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "质量"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "启用VBR/ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "类型："
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR选项："
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "最小码率(kbps)："
-
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "最大码率(kbps)："
-
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "严格执行最小码率"
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "最低比特率："
 
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR选项："
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "最高比特率："
 
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "平均码率(kbps)："
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "平均比特率："
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR质量等级："
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "严格执行最小码率"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "忽略Xing VBR头"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "帧参数："
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>边框头</b>"
 
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "标记为版权"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "标记为原始文件"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3参数："
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 标签</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "强制添加V2标签"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "仅添加v1标签"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "仅添加v2标签"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "质量"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "标签"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "质量等级(0-10)："
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "质量（0-1）："
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "常规"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC 解码器"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "无损的"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1456,7 +1555,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1464,19 +1563,19 @@ msgstr ""
 "Audacious 的 GIO 插件\n"
 "版权所有 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO 插件"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "读取-追加模式不受支持"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "打开模式不可用"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1496,32 +1595,10 @@ msgstr ""
 "\n"
 "许可: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 频谱分析器"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"Audacious OpenGL 频谱图分析器\n"
-"Christophe Budé, John Lindgren, Carlo Bramini. 2013 版权所有\n"
-"William Pitcock. 2014 版权所有\n"
-"\n"
-"基于 XMMS 插件：\n"
-"Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson，4Front Technologies. "
-"1998-2000 版权所有\n"
-"\n"
-"许可: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "GNOME 快捷键"
@@ -1542,8 +1619,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "序号"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "标题"
@@ -1600,8 +1677,8 @@ msgstr "可用列"
 msgid "Displayed columns"
 msgstr "显示列"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "搜索工具"
 
@@ -1629,335 +1706,338 @@ msgstr "无面板"
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "打开文件...(_O)"
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "打开URL...(_U)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "添加文件(_A)"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "添加URL...(_R)"
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "搜索库 (_L)"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "关于(_b)"
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "设置 ... (_S)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "暂停(_e)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "上一首(_v)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "重复(_R)"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "随机(_h)"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "专辑随机(_m)"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "禁止自动播放下一首(_o)"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "在这首歌后停止"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "歌曲信息...(_I)"
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "跳到时间...(_T)"
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "跳到歌曲...(_J)"
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "设置重复点 _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "设置重复点 _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "清除重复点(_C)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "按标题(_T)"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "按文件名(_F)"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "按文件路径(_P)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "按音轨序号(_N)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "按艺术家(_A)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "按专辑(_b)"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "按专辑艺术家(_m)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "按发表日期(_D)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "按照类型 (_G)"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "按长度(_L)"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "按文件路径(_F)"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "按自定义标题(_C)"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "逆序(_e)"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "随机(_R)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "播放/继续 (_P)"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "排序选中项(_l)"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "删除重复(_D)"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "移除无效文件(_U)"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "新建(_N)"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "重命名(_a) ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "移除 (_v)"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "导入...(_I)"
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "导出...(_E)"
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "播放列表管理器（_M）..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "队列管理器(_Q)..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "调高音量(_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "调低音量(_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "均衡器... (_E)"
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "音效 ... (_E)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "录制(_R)"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "音频设置...(_S)"
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "显示菜单(_M)"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "显示信息区域(_n)"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "显示可视化信息栏（_U）"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "显示剩余时间(_R)"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "可视化 ... (_V)"
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "回放(_P)"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "播放列表(_l)"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "服务(_S)"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "输出(_O)"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "外观(_V)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "入队／出列(_Q)"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "打开所属文件夹 (_O)"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "刷新选中项(_R)"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "剪切(_t)"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "在末尾粘贴(_E)"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "选中全部(_A)"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "重命名...(_R)"
 
@@ -1998,57 +2078,56 @@ msgstr "箭头键排序:"
 msgid "Scroll on song change"
 msgstr "歌曲改变时滚动"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK界面"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "缓冲中..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "单声道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "立体声"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d声道"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "单一窗口模式"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "播放列表模式"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "完成后停止"
 
@@ -2056,9 +2135,9 @@ msgstr "完成后停止"
 msgid "Previous track"
 msgstr "上一首"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "播放"
 
@@ -2066,8 +2145,8 @@ msgstr "播放"
 msgid "Pause/Resume"
 msgstr "暂停/继续"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "停止"
 
@@ -2161,7 +2240,7 @@ msgstr "<b>键位绑定：</b>"
 msgid "_Add"
 msgstr "添加 (_A)"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "全局热键"
 
@@ -2191,35 +2270,35 @@ msgstr ""
 "Jonathan A. Davis <davis@jdhouse.org>,\n"
 "Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK 输出"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "自动连接到输出端口"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "仅发现 %d 个 JACK 端口，但是需要 %d 个。"
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "连接到 JACK 端口 %s 失败。"
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr "JACK 仅支持浮点音频。你必须在 Audacious 设置中将输出位深改为浮点。"
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "连接到 JACK 服务器失败，服务是否在运行？"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2321,48 +2400,48 @@ msgstr "重新连接 LIRC 服务器"
 msgid "Wait before reconnecting:"
 msgstr "重连前等待："
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki 插件"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "没有相符歌词"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "错误"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "无法取回 %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "无法解析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "正在搜索歌词..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "缺少歌曲元信息"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "正在连接到 lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "编辑歌词 ..."
 
@@ -2374,17 +2453,17 @@ msgstr "M3U 播放列表"
 msgid "Tact Generator"
 msgstr "Tact 生成器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "节拍生成器: 每分钟节拍为 %d"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "节拍生成器: 每分钟节拍为 %d %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2539,15 +2618,15 @@ msgstr "这些设置会在重启 Audacious 后生效。"
 msgid "MPG123 Plugin"
 msgstr "MPG123 插件"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>高级设置</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "使用精确长度计算（慢）"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "环绕音"
 
@@ -2559,35 +2638,35 @@ msgstr "MPRIS 2 服务器"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS 插件"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "重定向解析错误"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "未知 HTTP 错误"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "解析网址错误"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "太多重定向"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious未开始播放"
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面提醒"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2623,15 +2702,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "显示回放控制"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "总是显示消息提醒"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "在通知中显示专辑名"
 
@@ -2639,21 +2718,21 @@ msgstr "在通知中显示专辑名"
 msgid "Show"
 msgstr "显示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "暂停"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "下一首"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 输出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 输出"
 
@@ -2695,23 +2774,23 @@ msgstr ""
 "我希望感谢 #audacious 上的人们，尤其 Tony Vroon 及 John Lindgren，当然，还有"
 "之前 OSS 插件的作者们。"
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "播放列表管理器"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "条目"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "重命名(_a)"
 
@@ -2723,51 +2802,49 @@ msgstr "PLS 播放列表"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 解码器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio 输出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Audacious 的 PulseAudio 输出插件\n"
+"Audacious PulseAudio 输出插件\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 输出"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2781,47 +2858,73 @@ msgstr ""
 "基于Audacious SDL 输出插件\n"
 "John Lindgren 2010 版权所有"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Audacious OpenGL 频谱图分析器\n"
+"Christophe Budé, John Lindgren, Carlo Bramini. 2013 版权所有\n"
+"William Pitcock. 2014 版权所有\n"
+"\n"
+"基于 XMMS 插件：\n"
+"Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson，4Front Technologies. "
+"1998-2000 版权所有\n"
+"\n"
+"许可: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "工作中 ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr ""
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "搜索"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "打开文件夹 ... (&O)"
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "添加文件夹 ... (Add)"
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "日志监视(_L) ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "打开文件"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "添加文件"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "上一首"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "重复"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "随机"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "打开文件夹 ... (&O)"
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "添加文件夹 ... (Add)"
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "日志监视(_L) ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt 界面"
 
@@ -2865,7 +2968,7 @@ msgstr "<b>转换</b>"
 msgid "Method:"
 msgstr "方法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "比率："
 
@@ -2917,55 +3020,42 @@ msgstr "176.4 kHz:"
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "搞定。正在为用户 %s Scrobble"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "权限阻止"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "请访问如下链接以允许 Audacious Scrobble 你的播放列表: "
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "保持此窗口并再次点击 '检查权限'。\n"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"不要担心。你的 Scrobble 已保存到了计算机上。\n"
-"他们将在 Audacious 被允许时提交。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "网络问题。"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "在访问 Last.fm 时遇到问题。请稍候重试。"
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "正在检索……"
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "检查权限(_C)"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "吊销权限(_R)"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "你需要允许 Audacious 以 Scrobble 你 Last.fm 帐户上的音乐。\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2996,7 +3086,7 @@ msgstr ""
 "感谢 John Lindgren 在项目初始阶段提供的帮助\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -3004,11 +3094,11 @@ msgstr ""
 "Audacious 目前正在使用一个增强版的 Last.fm Scrobbler.\n"
 "请检查 Scrobbler 插件的首选项。"
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 输出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3016,65 +3106,65 @@ msgstr ""
 "Audacious 的 SDL 输出插件\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "库"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d 个结果"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d 个隐藏的)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d 首歌"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "属于此风格"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "在"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "-"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "创建播放列表(_C)"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "添加到播放列表(_A)"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "搜索库"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr "要将您的音乐库导入Audacious，选择一个文件夹，然后点击“刷新”图标。"
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "请稍等...."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "选择文件夹"
 
@@ -3170,15 +3260,15 @@ msgstr "阈值："
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "重复点已清除。"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "重复点 A 已设置。"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "重复点 B 已设置。"
 
@@ -3230,373 +3320,381 @@ msgstr "16000 赫兹"
 msgid "Audacious Equalizer"
 msgstr "Audacious均衡器"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "查找： %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量：%d%%"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡：%d%% 左"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "平衡：中间"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡：%d%% 右"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "选项菜单"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "禁用“顶置窗口”"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "启用“顶置窗口”"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "文件信息"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "双倍大小"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "可视化效果"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "录制开启"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "录制关闭"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "增加音量"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "减小音量"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "效果..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "录制"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "音频设置..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "打开文件 ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "打开 URL ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "搜索库"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "回放"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "播放列表"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "输出"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "外观"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "服务"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "关于 ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "设置 ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "退出"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "歌曲信息 ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "专辑随机"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "禁止自动播放下一首"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "在这首歌后停止"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "设置 A-B 点重复"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "清除 A-B 点重复"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "跳至曲目 ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "跳至时间 ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "播放/继续"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "新建播放列表"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "重命名播放列表 ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "移除播放列表"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "上一个播放列表"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "下一个播放列表"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "导入播放列表"
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "导出播放列表 ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "播放列表管理器 ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "队列管理器 ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "刷新播放列表"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "显示播放列表编辑器"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "显示均衡器"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "显示重命名时间"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "顶置窗口"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "所有工作区可见"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "收起播放器"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "收起播放列表编辑器"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "收起均衡器"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "添加 URL ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "添加文件 ..."
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "按标题"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "按文件名"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "按文件路径"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "清空"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "清空队列"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "删除不可用文件"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "删除重复的条目"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "删除未被选中的"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "删除已选中的"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "搜索/选择"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "反选"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "取消选中"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "选中全部"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "按音轨号码"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "按艺术家"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "按专辑"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "按专辑艺术家"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "按发表日期"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "按照类型"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "按照长度"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "按照自定义标题"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "打乱列表"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "反转列表"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "排序已选中的"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "打开包含的文件夹"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "剪切"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "复制"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "在末尾粘贴"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "加入/移出列表"
 
@@ -3609,15 +3707,15 @@ msgstr "Audacious播放列表编辑器"
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp 经典界面"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "打开文件夹 ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "添加文件夹 ..."
 
@@ -3705,7 +3803,7 @@ msgid "Slow"
 msgstr "慢"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "中速"
 
@@ -3839,7 +3937,7 @@ msgstr "用匹配的条目创建新的播放列表"
 msgid "Sndfile Plugin"
 msgstr "Sndfile 插件"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3879,60 +3977,60 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 输出"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "设备(默认为空)："
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "保存并恢复音量："
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio 错误：不支持音频格式(%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio 错误： sio_open() failed"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio 错误： sio_setpar() failed"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio 错误： sio_start() failed"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "歌曲改变"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>命令</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "开始播放新歌曲时运行命令："
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "歌曲结束播放时运行命令："
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "播放列表结束时运行命令："
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "歌曲标题改变时运行命令(用于网络流媒体)："
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3940,7 +4038,7 @@ msgstr ""
 "你可以使用如下的格式代码，程序运行前会将其替换（并非所有代码都对播放列表结尾"
 "命令生效）"
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3966,21 +4064,21 @@ msgstr ""
 "%t: 播放列表位置\n"
 "%T: 标题（未经格式化）"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr "传递到命令行的参数一定要用引号包围，否则可能导致未预期的结果。"
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "歌曲信息"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重采样器"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3994,43 +4092,43 @@ msgstr ""
 "基于取样率转换器插件:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "音质: "
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "速度和音调"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>速度和音调</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "速度："
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "音调："
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "状态图标"
 
@@ -4133,12 +4231,12 @@ msgstr "<b>Extra Stereo</b>"
 msgid "Tone Generator"
 msgstr "Tone Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音调生成器: "
 
@@ -4160,7 +4258,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "人声消除"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4237,7 +4335,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX 解码器"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4247,19 +4345,31 @@ msgstr ""
 "基于 Roman Sherbakov <v_soft@microfor.ru> 制作的 in_vtx.dll\n"
 "Audacious 插件作者为 Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"用于 Audacious 的 Win32 waveOut 插件\n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack 解码器"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "有损的 (混合)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "有损的"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4273,32 +4383,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF 解码器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF 设置</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "忽略文件长度"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "可分享的 XML 播放列表 (XSPF)"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had a different number of channels.  "
-#~ "You can use the Channel Mixer to convert the songs to the same number of "
-#~ "channels."
-#~ msgstr ""
-#~ "淡出失败， 原因：歌曲的通道数不一致。\n"
-#~ "\n"
-#~ "你可以尝试使用”声道混音器“使歌曲的通道数保持一致。"
-
-#~ msgid ""
-#~ "Crossfading failed because the songs had different sample rates.  You can "
-#~ "use the Sample Rate Converter to convert the songs to the same sample "
-#~ "rate."
-#~ msgstr ""
-#~ "淡出失败， 原因：歌曲的采样率不一致。\n"
-#~ "\n"
-#~ "你可以尝试使用”采样率转换器“使歌曲的采样保持一致。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5aec9b6..d8363b5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Ruei-Yuan Lu <rueiyuan.lu@gmail.com>, 2014
+# 盧瑞元（ryuanlu） <rueiyuan.lu@gmail.com>, 2014
 # Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>, 2011
+# 盧瑞元（ryuanlu） <rueiyuan.lu@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2016-03-26 21:41+0100\n"
-"PO-Revision-Date: 2015-09-12 15:46+0000\n"
-"Last-Translator: Ruei-Yuan Lu <rueiyuan.lu@gmail.com>\n"
+"POT-Creation-Date: 2016-09-18 19:53+0200\n"
+"PO-Revision-Date: 2016-09-15 11:31+0000\n"
+"Last-Translator: 盧瑞元（ryuanlu） <rueiyuan.lu@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/jlindgren/"
 "audacious/language/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -20,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:18
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 解碼器"
 
@@ -28,20 +29,20 @@ msgstr "AAC (Raw) 解碼器"
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cc:343
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:89 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:144 src/modplug/modplugbmp.cc:337
+#: src/psf/plugin.cc:136 src/vtx/vtx.cc:89 src/xsf/plugin.cc:106
 msgid "sequenced"
 msgstr "編曲機"
 
-#: src/alarm/alarm.cc:56 src/alarm/interface.cc:78
+#: src/alarm/alarm.cc:55 src/alarm/interface.cc:79
 msgid "Alarm"
 msgstr "鬧鐘"
 
-#: src/alarm/alarm.cc:783
+#: src/alarm/alarm.cc:782
 msgid "Set Alarm ..."
 msgstr "設定鬧鐘 ..."
 
-#: src/alarm/alarm.cc:811
+#: src/alarm/alarm.cc:810
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
@@ -51,7 +52,7 @@ msgstr ""
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 
-#: src/alarm/interface.cc:27
+#: src/alarm/interface.cc:28
 msgid ""
 "Time\n"
 "  Alarm at:\n"
@@ -145,147 +146,147 @@ msgstr ""
 "    鬧鐘停止以後顯示提示訊息。\n"
 "    請在欄位中輸入提示訊息並勾選啟用。"
 
-#: src/alarm/interface.cc:77
+#: src/alarm/interface.cc:78
 msgid "This is your wakeup call."
 msgstr "這是您的喚醒。"
 
-#: src/alarm/interface.cc:95
+#: src/alarm/interface.cc:96
 msgid "Your reminder for today is..."
 msgstr "您今天的提醒"
 
-#: src/alarm/interface.cc:97 src/alarm/interface.cc:381
+#: src/alarm/interface.cc:98 src/alarm/interface.cc:372
 msgid "Reminder"
 msgstr "提醒"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Monday"
 msgstr "星期一"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/alarm/interface.cc:128
+#: src/alarm/interface.cc:122
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Friday"
 msgstr "星期五"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/alarm/interface.cc:129
+#: src/alarm/interface.cc:123
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/alarm/interface.cc:166 src/alarm/interface.cc:225
-#: src/alarm/interface.cc:240
+#: src/alarm/interface.cc:160 src/alarm/interface.cc:219
+#: src/alarm/interface.cc:234
 msgid "Time"
 msgstr "時間"
 
-#: src/alarm/interface.cc:173
+#: src/alarm/interface.cc:167
 msgid "Alarm at (default):"
 msgstr "鈴響於 (預設)"
 
-#: src/alarm/interface.cc:195
+#: src/alarm/interface.cc:189
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.cc:198
+#: src/alarm/interface.cc:192
 msgid "Quiet after:"
 msgstr "多久後靜音："
 
-#: src/alarm/interface.cc:210
+#: src/alarm/interface.cc:204
 msgid "hours"
 msgstr "小時"
 
-#: src/alarm/interface.cc:221
+#: src/alarm/interface.cc:215
 msgid "minutes"
 msgstr "分鐘"
 
-#: src/alarm/interface.cc:230
+#: src/alarm/interface.cc:224
 msgid "Choose the days for the alarm to come on"
 msgstr "選擇想要在哪幾天啟用鬧鐘"
 
-#: src/alarm/interface.cc:237
+#: src/alarm/interface.cc:231
 msgid "Day"
 msgstr "哪幾天"
 
-#: src/alarm/interface.cc:254 src/bs2b/plugin.cc:130
+#: src/alarm/interface.cc:248 src/bs2b/plugin.cc:130
 msgid "Default"
 msgstr "預設"
 
-#: src/alarm/interface.cc:283
+#: src/alarm/interface.cc:277
 msgid "Days"
 msgstr "週排程"
 
-#: src/alarm/interface.cc:292
+#: src/alarm/interface.cc:286
 msgid "Fading"
 msgstr "淡出"
 
-#: src/alarm/interface.cc:300 src/console/plugin.cc:41
+#: src/alarm/interface.cc:294 src/console/plugin.cc:41
 #: src/crossfade/crossfade.cc:52 src/crossfade/crossfade.cc:58
 #: src/gtkui/settings.cc:49 src/lirc/lirc.cc:398 src/sid/xs_config.cc:85
 #: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.cc:307 src/alarm/interface.cc:348
+#: src/alarm/interface.cc:301 src/alarm/interface.cc:342
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.cc:312
+#: src/alarm/interface.cc:306
 msgid "Start at"
 msgstr "初始音量"
 
-#: src/alarm/interface.cc:328
+#: src/alarm/interface.cc:322
 msgid "Final"
 msgstr "最終音量"
 
-#: src/alarm/interface.cc:341
+#: src/alarm/interface.cc:335
 msgid "Current"
 msgstr "目前音量"
 
-#: src/alarm/interface.cc:354
+#: src/alarm/interface.cc:348
 msgid "Additional Command"
 msgstr "額外命令"
 
-#: src/alarm/interface.cc:360 src/alarm/interface.cc:386
+#: src/alarm/interface.cc:354 src/alarm/interface.cc:377
 msgid "enable"
 msgstr "啟用"
 
-#: src/alarm/interface.cc:367
+#: src/alarm/interface.cc:361
 msgid "Playlist (optional)"
 msgstr "播放清單 (選用)"
 
-#: src/alarm/interface.cc:374
+#: src/alarm/interface.cc:365
 msgid "Select a playlist"
 msgstr "請選擇播放清單"
 
-#: src/alarm/interface.cc:394
+#: src/alarm/interface.cc:385
 msgid "Options"
 msgstr "選項"
 
-#: src/alarm/interface.cc:399
+#: src/alarm/interface.cc:390
 msgid "What do these options mean?"
 msgstr "這些選項代表什麼意思？"
 
-#: src/alarm/interface.cc:413
+#: src/alarm/interface.cc:404
 msgid "Help"
 msgstr "說明"
 
-#: src/albumart/albumart.cc:32 src/albumart-qt/albumart.cc:34
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:33
 msgid "Album Art"
 msgstr "專輯封面"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 輸出"
 
@@ -327,11 +328,11 @@ msgstr "混音器裝置："
 msgid "Mixer element:"
 msgstr "混音器元件："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:41
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:439
+#: src/amidiplug/amidi-plug.cc:435
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -373,68 +374,68 @@ msgstr ""
 "Tony Vroon\n"
 "for the good help with alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "覆載預設的增益值："
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "覆載預設的同時發音數："
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "覆載預設的殘響強度："
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "啟用"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "覆載預設和聲強度："
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "<b>Playback</b>"
 msgstr "<b>播放</b>"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "移調："
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:235
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "鼓移："
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "音符數量"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "跳過開頭的靜音"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "跳過結尾的靜音"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "<b>SoundFont</b>"
 msgstr "<b>SoundFont</b>"
 
-#: src/amidi-plug/i_configure.cc:145
+#: src/amidiplug/i_configure.cc:145
 msgid "<b>Synthesizer</b>"
 msgstr "<b>合成器</b>"
 
-#: src/amidi-plug/i_configure.cc:150 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
+#: src/amidiplug/i_configure.cc:150 src/console/plugin.cc:45
+#: src/filewriter/filewriter.cc:474 src/sid/xs_config.cc:65
 msgid "Sample rate:"
 msgstr "取樣率："
 
-#: src/amidi-plug/i_configure.cc:152 src/bs2b/plugin.cc:141
+#: src/amidiplug/i_configure.cc:152 src/bs2b/plugin.cc:141
 #: src/console/plugin.cc:47 src/modplug/plugin_main.cc:81
 #: src/resample/resample.cc:201 src/resample/resample.cc:207
 #: src/resample/resample.cc:211 src/resample/resample.cc:215
@@ -442,86 +443,106 @@ msgstr "取樣率："
 #: src/resample/resample.cc:227 src/resample/resample.cc:231
 #: src/resample/resample.cc:235 src/resample/resample.cc:239
 #: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
+#: src/soxr/sox-resampler.cc:164
 msgid "Hz"
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:54
+#: src/amidiplug/i_configure-fluidsynth.cc:54
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 選擇 SoundFont 檔案"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:57
+#: src/amidiplug/i_configure-fluidsynth.cc:57
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:58
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:227 src/gtkui/columns.cc:46
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:231
+#: src/amidiplug/i_configure-fluidsynth.cc:231
 msgid "Size (bytes)"
 msgstr "大小 (位元組)"
 
-#: src/amidi-plug/i_fileinfo.cc:165
+#: src/amidiplug/i_fileinfo.cc:165
 msgid "Name:"
 msgstr "名稱："
 
-#: src/amidi-plug/i_fileinfo.cc:183
+#: src/amidiplug/i_fileinfo.cc:183
 msgid "<span size=\"smaller\"> MIDI Info </span>"
 msgstr "<span size=\"smaller\"> MIDI 資訊 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:197
+#: src/amidiplug/i_fileinfo.cc:197
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:200
+#: src/amidiplug/i_fileinfo.cc:200
 msgid "Length (msec):"
 msgstr "長度 (毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:203
+#: src/amidiplug/i_fileinfo.cc:203
 msgid "No. of Tracks:"
 msgstr "音軌編號："
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:209
 msgid "variable"
 msgstr "變動的"
 
-#: src/amidi-plug/i_fileinfo.cc:211
+#: src/amidiplug/i_fileinfo.cc:211
 msgid "BPM:"
 msgstr "BPM："
 
-#: src/amidi-plug/i_fileinfo.cc:219
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "BPM (wavg):"
 msgstr "BPM (wavg)："
 
-#: src/amidi-plug/i_fileinfo.cc:222
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "Time Div:"
 msgstr "時間分割："
 
-#: src/amidi-plug/i_fileinfo.cc:233
+#: src/amidiplug/i_fileinfo.cc:233
 msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
 msgstr "<span size=\"smaller\"> MIDI 備註與歌詞 </span>"
 
-#: src/amidi-plug/i_fileinfo.cc:280
+#: src/amidiplug/i_fileinfo.cc:280
 msgid "* no comments available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含備註資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:292
+#: src/amidiplug/i_fileinfo.cc:292
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含歌詞資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
+#: src/amidiplug/i_fileinfo.cc:302 src/ladspa/plugin.cc:417
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:327
+#: src/amidiplug/i_fileinfo.cc:327
 msgid "  (invalid UTF-8)"
 msgstr "  (無效的 UTF-8 字串)"
 
+#: src/ampache/ampache.cc:31
+msgid "Ampache Browser"
+msgstr "Ampache 瀏覽器"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser\n"
+"\n"
+"Ampache client for Audacious.\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+msgstr ""
+"Ampache 瀏覽器\n"
+"\n"
+"Audacious 的 Ampache 客戶端。\n"
+"\n"
+"License: GNU GPLv3\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+
 #: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
@@ -540,7 +561,7 @@ msgstr ""
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 
-#: src/aosd/aosd.h:38
+#: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
 msgstr "AOSD (Audacious OSD)"
 
@@ -592,94 +613,94 @@ msgstr "解除暫停"
 msgid "Triggers OSD when playback is unpaused."
 msgstr "當解除暫停時觸發 OSD"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:162
 msgid "Placement"
 msgstr "放置位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:195
 msgid "Relative X offset:"
 msgstr "X 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:202
 msgid "Relative Y offset:"
 msgstr "Y 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:209
 msgid "Max OSD width:"
 msgstr "最大 OSD 寬度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:220
 msgid "Multi-Monitor options"
 msgstr "多螢幕選項"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:224
 msgid "Display OSD using:"
 msgstr "顯示 OSD："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:226
 msgid "all monitors"
 msgstr "所有螢幕"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:229
 #, c-format
 msgid "monitor %i"
 msgstr "螢幕 %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:281
 msgid "Timing (ms)"
 msgstr "計時 (毫秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:286
 msgid "Display:"
 msgstr "顯示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:291
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:296
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:360
 msgid "Fonts"
 msgstr "字型"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:367
 #, c-format
 msgid "Font %i:"
 msgstr "字型 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:381
 msgid "Shadow"
 msgstr "陰影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:485
 msgid "Render Style"
 msgstr "呈現樣式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:501
 msgid "Colors"
 msgstr "顏色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:512
 #, c-format
 msgid "Color %i:"
 msgstr "顏色 %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:599
 msgid "Enable trigger"
 msgstr "啟用觸發器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:626
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:653
 msgid "Composite manager detected"
 msgstr "已偵測到合成特效管理程式"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:660
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -688,60 +709,56 @@ msgstr ""
 "未偵測到合成特效管理程式；\n"
 "除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:668
 msgid "Composite manager not required for fake transparency"
 msgstr "假的透明特效不需要 Composite manager"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:705
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:711
 msgid "Fake transparency"
 msgstr "假的透明特效"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:713
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真的透明特效 (需要 X Composite 延伸功能)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:754
 msgid "Composite extension not loaded"
 msgstr "Composite 延伸功能未載入"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite 延伸功能不存在"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:771
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:834
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:839
 msgid "Animation"
 msgstr "動畫"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:844
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:849
 msgid "Decoration"
 msgstr "裝飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:854
 msgid "Trigger"
 msgstr "觸發"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:859
 msgid "Misc"
 msgstr "雜項"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:868
 msgid "Test"
 msgstr "測試"
 
@@ -757,11 +774,11 @@ msgstr "ASXv1／ASXv2 播放清單"
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放清單 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:40
+#: src/blur_scope/blur_scope.cc:39
 msgid "<b>Color</b>"
 msgstr "<b>色彩</b>"
 
-#: src/blur_scope/blur_scope.cc:56
+#: src/blur_scope/blur_scope.cc:55
 msgid "Blur Scope"
 msgstr "模糊波形"
 
@@ -785,15 +802,15 @@ msgstr "x1/10 dB"
 msgid "Cut frequency:"
 msgstr "截斷頻率："
 
-#: src/cairo-spectrum/cairo-spectrum.cc:42
+#: src/cairo-spectrum/cairo-spectrum.cc:41
 msgid "Spectrum Analyzer"
 msgstr "頻譜分析儀"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:71
+#: src/cdaudio/cdaudio-ng.cc:71
 msgid "Audio CD Plugin"
 msgstr "音樂 CD 外掛"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:119
+#: src/cdaudio/cdaudio-ng.cc:117
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -813,118 +830,118 @@ msgstr ""
 "\n"
 "This was a Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:135
+#: src/cdaudio/cdaudio-ng.cc:133
 msgid "<b>Device</b>"
 msgstr "<b>裝置</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:136
+#: src/cdaudio/cdaudio-ng.cc:134
 msgid "Read speed:"
 msgstr "讀取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:139
+#: src/cdaudio/cdaudio-ng.cc:137
 msgid "Override device:"
 msgstr "覆載裝置："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:139
 msgid "<b>Metadata</b>"
 msgstr "<b>詮釋資料</b>"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:142
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Use CD-Text"
 msgstr "使用 CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:142
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用 HTTP 而非 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:149
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:153
+#: src/cdaudio/cdaudio-ng.cc:151
 msgid "Path:"
 msgstr "路徑："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:157
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Port:"
 msgstr "連接埠："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:243
+#: src/cdaudio/cdaudio-ng.cc:241
 msgid "Failed to initialize cdio subsystem."
 msgstr "無法初始化 cdio 子系統。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:278
+#: src/cdaudio/cdaudio-ng.cc:276
 #, c-format
 msgid "Invalid URI %s."
 msgstr "無效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:280
+#: src/cdaudio/cdaudio-ng.cc:278
 #, c-format
 msgid "Track %d not found."
 msgstr "找不到音軌 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:282
+#: src/cdaudio/cdaudio-ng.cc:280
 #, c-format
 msgid "Track %d is a data track."
 msgstr "軌道 %d 是資料軌。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:357
+#: src/cdaudio/cdaudio-ng.cc:355
 msgid "Error reading audio CD."
 msgstr "讀取音樂 CD 時發生錯誤。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:426
+#: src/cdaudio/cdaudio-ng.cc:424
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:459 src/cdaudio-ng/cdaudio-ng.cc:468
+#: src/cdaudio/cdaudio-ng.cc:459 src/cdaudio/cdaudio-ng.cc:468
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "無法開啟 CD 裝置 %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:471
+#: src/cdaudio/cdaudio-ng.cc:471
 msgid "No audio capable CD drive found."
 msgstr "找不到可以播放音訊的光碟機。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:496
+#: src/cdaudio/cdaudio-ng.cc:496
 msgid "Failed to finish initializing opened CD drive."
 msgstr "開啟的光碟機無法完成初始化。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:509
+#: src/cdaudio/cdaudio-ng.cc:509
 msgid "Failed to retrieve first/last track number."
 msgstr "無法取得第一個或最後的音軌編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:530
+#: src/cdaudio/cdaudio-ng.cc:530
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "無法讀取音軌 %d 的起始／結束邏輯磁區編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:612
+#: src/cdaudio/cdaudio-ng.cc:612
 msgid "Failed to create the cddb connection."
 msgstr "無法建立 cddb 的連線。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:678
+#: src/cdaudio/cdaudio-ng.cc:678
 msgid "Failed to query the CDDB server"
 msgstr "無法查詢 CDDB 伺服器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:680
+#: src/cdaudio/cdaudio-ng.cc:680
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "無法查詢 CDDB 伺服器：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:704
+#: src/cdaudio/cdaudio-ng.cc:704
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "無法讀取 cddb 資訊：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:764
+#: src/cdaudio/cdaudio-ng.cc:764
 msgid "Drive is empty."
 msgstr "光碟機是空的。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:766
+#: src/cdaudio/cdaudio-ng.cc:766
 msgid "Unsupported disk type."
 msgstr "未支援的光碟類型"
 
@@ -1092,58 +1109,60 @@ msgstr "效果強度："
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:36
+#: src/cue/cue.cc:41
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet 外掛"
 
-#: src/delete-files/delete-files.cc:47 src/delete-files/delete-files.cc:147
+#: src/delete-files/delete-files.cc:52 src/delete-files/delete-files.cc:161
+#: src/delete-files/delete-files.cc:176
 msgid "Delete Files"
 msgstr "刪除檔案"
 
-#: src/delete-files/delete-files.cc:76
+#: src/delete-files/delete-files.cc:86
 #, c-format
 msgid "Error moving %s to trash: %s."
 msgstr "移動「%s」到垃圾桶時發生錯誤：%s。"
 
-#: src/delete-files/delete-files.cc:87
+#: src/delete-files/delete-files.cc:97
 #, c-format
 msgid "Error deleting %s: %s."
 msgstr "刪除「%s」時發生錯誤：%s。"
 
-#: src/delete-files/delete-files.cc:118
+#: src/delete-files/delete-files.cc:128
 #, c-format
 msgid "Error deleting %s: not a local file."
 msgstr "刪除「%s」時發生錯誤：這不是本機檔案。"
 
-#: src/delete-files/delete-files.cc:135
+#: src/delete-files/delete-files.cc:138
 msgid "Do you want to move the selected files to the trash?"
 msgstr "您確定要將選擇的檔案移動到垃圾桶嗎？"
 
-#: src/delete-files/delete-files.cc:136
+#: src/delete-files/delete-files.cc:139
 msgid "Move to Trash"
 msgstr "移動到垃圾桶"
 
-#: src/delete-files/delete-files.cc:141
+#: src/delete-files/delete-files.cc:144
 msgid "Do you want to permanently delete the selected files?"
 msgstr "您確定要永久地刪除選擇的檔案嗎？"
 
-#: src/delete-files/delete-files.cc:142
+#: src/delete-files/delete-files.cc:145
 msgid "Delete"
 msgstr "刪除"
 
-#: src/delete-files/delete-files.cc:146 src/skins/search-select.cc:76
+#: src/delete-files/delete-files.cc:159 src/delete-files/delete-files.cc:180
+#: src/skins/search-select.cc:76
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:167
+#: src/delete-files/delete-files.cc:211
 msgid "Delete Selected Files"
 msgstr "刪除選擇的檔案"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:231
 msgid "<b>Delete Method</b>"
 msgstr "<b>刪除方式</b>"
 
-#: src/delete-files/delete-files.cc:183
+#: src/delete-files/delete-files.cc:232
 msgid "Move to trash instead of deleting immediately"
 msgstr "移動到垃圾桶而不是直接刪除"
 
@@ -1185,11 +1204,11 @@ msgstr "音量："
 msgid "Echo"
 msgstr "回音"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:49
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 外掛"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:604
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1205,15 +1224,11 @@ msgstr ""
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:44
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "檔案輸出外掛"
 
-#: src/filewriter/filewriter.cc:315
-msgid "Pick a folder"
-msgstr "選擇一個資料夾"
-
-#: src/filewriter/filewriter.cc:347
+#: src/filewriter/filewriter.cc:351
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1243,194 +1258,278 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:374
+#: src/filewriter/filewriter.cc:378
 msgid "Output file format:"
 msgstr "輸出檔案格式："
 
-#: src/filewriter/filewriter.cc:378
+#: src/filewriter/filewriter.cc:382
 msgid "Save into original directory"
 msgstr "儲存到原始資料夾"
 
-#: src/filewriter/filewriter.cc:381
+#: src/filewriter/filewriter.cc:385
 msgid "Save into custom directory:"
 msgstr "儲存到自訂資料夾："
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:393
 msgid "Generate file name from:"
 msgstr "產生檔名自："
 
-#: src/filewriter/filewriter.cc:387
+#: src/filewriter/filewriter.cc:394
 msgid "Original file name"
 msgstr "原始檔案的檔名"
 
-#: src/filewriter/filewriter.cc:390
+#: src/filewriter/filewriter.cc:397
 msgid "Original file name (no suffix)"
 msgstr "原始的檔案名稱(移除原本的副檔名)"
 
-#: src/filewriter/filewriter.cc:393
+#: src/filewriter/filewriter.cc:400
 msgid "Original file tag"
 msgstr "原始檔案的標籤"
 
-#: src/filewriter/filewriter.cc:397
+#: src/filewriter/filewriter.cc:404
 msgid "Prepend track number to file name"
 msgstr "在檔案名稱前加入音軌編號"
 
-#: src/filewriter/filewriter.cc:414 src/skins-qt/skins_cfg.cc:304
-#: src/skins/skins_cfg.cc:286
-msgid "General"
-msgstr "一般"
-
-#: src/filewriter/mp3.cc:39 src/filewriter/mp3.cc:603
+#: src/filewriter/filewriter.cc:410 src/filewriter/filewriter.cc:442
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:39
+#: src/filewriter/filewriter.cc:411
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:412
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:413
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:414
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:415
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:416
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:417
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:418
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "8 kbps"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:424
+msgid "16 kbps"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:425
+msgid "32 kbps"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:426
+msgid "40 kbps"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:427
+msgid "48 kbps"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:428
+msgid "56 kbps"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:429
+msgid "64 kbps"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:430
+msgid "80 kbps"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "96 kbps"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "112 kbps"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "128 kbps"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "160 kbps"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "192 kbps"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "224 kbps"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "256 kbps"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "320 kbps"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:443
 msgid "Joint Stereo"
 msgstr "聯合立體聲"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:61
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:444 src/modplug/plugin_main.cc:61
+#: src/mpg123/mpg123.cc:245
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/filewriter/mp3.cc:40 src/modplug/plugin_main.cc:60
-#: src/mpg123/mpg123.cc:243
+#: src/filewriter/filewriter.cc:445 src/modplug/plugin_main.cc:60
+#: src/mpg123/mpg123.cc:245
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/filewriter/mp3.cc:574
-msgid "Algorithm Quality:"
-msgstr "演算法品質："
-
-#: src/filewriter/mp3.cc:594
-msgid "Output Sample Rate:"
-msgstr "輸出取樣率："
+#: src/filewriter/filewriter.cc:449
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:621
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:450
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:627
-msgid "Bitrate / Compression Ratio:"
-msgstr "位元率／壓縮比："
+#: src/filewriter/filewriter.cc:471
+msgid "Algorithm quality:"
+msgstr "演算法品質："
 
-#: src/filewriter/mp3.cc:646
-msgid "Bitrate (kbps):"
-msgstr "位元率 (kbps)："
+#: src/filewriter/filewriter.cc:477
+msgid "Bitrate:"
+msgstr "位元率："
 
-#: src/filewriter/mp3.cc:675
+#: src/filewriter/filewriter.cc:484
 msgid "Compression ratio:"
 msgstr "壓縮比率："
 
-#: src/filewriter/mp3.cc:703
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:491
+msgid "Audio mode:"
 msgstr "音訊模式："
 
-#: src/filewriter/mp3.cc:727
-msgid "Miscellaneous:"
-msgstr "其他選項："
-
-#: src/filewriter/mp3.cc:736
+#: src/filewriter/filewriter.cc:494
 msgid "Enforce strict ISO compliance"
 msgstr "強制要求 ISO 相容"
 
-#: src/filewriter/mp3.cc:746
+#: src/filewriter/filewriter.cc:496
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.cc:757 src/filewriter/vorbis.cc:194
-msgid "Quality"
-msgstr "品質"
-
-#: src/filewriter/mp3.cc:766
+#: src/filewriter/filewriter.cc:501
 msgid "Enable VBR/ABR"
 msgstr "啟用 VBR／ABR"
 
-#: src/filewriter/mp3.cc:776
+#: src/filewriter/filewriter.cc:503
 msgid "Type:"
 msgstr "類型："
 
-#: src/filewriter/mp3.cc:804
-msgid "VBR Options:"
-msgstr "VBR 選項："
-
-#: src/filewriter/mp3.cc:815
-msgid "Minimum bitrate (kbps):"
-msgstr "最小位元率 (kbps)："
+#: src/filewriter/filewriter.cc:507
+msgid "Minimum bitrate:"
+msgstr "最低位元率："
 
-#: src/filewriter/mp3.cc:838
-msgid "Maximum bitrate (kbps):"
-msgstr "最大位元率 (kbps)："
+#: src/filewriter/filewriter.cc:511
+msgid "Maximum bitrate:"
+msgstr "最高位元率："
 
-#: src/filewriter/mp3.cc:859
-msgid "Strictly enforce minimum bitrate"
-msgstr "強制使用最小位元率"
-
-#: src/filewriter/mp3.cc:870
-msgid "ABR Options:"
-msgstr "ABR 選項："
-
-#: src/filewriter/mp3.cc:878
-msgid "Average bitrate (kbps):"
-msgstr "平均位元率 (kbps)："
+#: src/filewriter/filewriter.cc:515
+msgid "Average bitrate:"
+msgstr "平均位元率："
 
-#: src/filewriter/mp3.cc:903
+#: src/filewriter/filewriter.cc:519
 msgid "VBR quality level:"
 msgstr "VBR 品質等級："
 
-#: src/filewriter/mp3.cc:920
+#: src/filewriter/filewriter.cc:523
+msgid "Strictly enforce minimum bitrate"
+msgstr "強制使用最小位元率"
+
+#: src/filewriter/filewriter.cc:526
 msgid "Omit Xing VBR header"
 msgstr "省略 Xing VBR 檔頭"
 
-#: src/filewriter/mp3.cc:932
-msgid "VBR/ABR"
-msgstr "VBR／ABR"
+#: src/filewriter/filewriter.cc:532
+msgid "<b>Frame Headers</b>"
+msgstr "<b>音格標頭</b>"
 
-#: src/filewriter/mp3.cc:941
-msgid "Frame Parameters:"
-msgstr "音框參數："
-
-#: src/filewriter/mp3.cc:950
+#: src/filewriter/filewriter.cc:533
 msgid "Mark as copyright"
 msgstr "標示為版權"
 
-#: src/filewriter/mp3.cc:961
+#: src/filewriter/filewriter.cc:535
 msgid "Mark as original"
 msgstr "標示為原創"
 
-#: src/filewriter/mp3.cc:972
-msgid "ID3 Parameters:"
-msgstr "ID3 參數："
+#: src/filewriter/filewriter.cc:537
+msgid "<b>ID3 Tags</b>"
+msgstr "<b>ID3 標籤</b>"
 
-#: src/filewriter/mp3.cc:981
+#: src/filewriter/filewriter.cc:538
 msgid "Force addition of version 2 tag"
 msgstr "強制加入第二版標籤"
 
-#: src/filewriter/mp3.cc:990
+#: src/filewriter/filewriter.cc:540
 msgid "Only add v1 tag"
 msgstr "只加入第一版標籤"
 
-#: src/filewriter/mp3.cc:996
+#: src/filewriter/filewriter.cc:542
 msgid "Only add v2 tag"
 msgstr "只加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1016
+#: src/filewriter/filewriter.cc:547
+msgid "Quality"
+msgstr "品質"
+
+#: src/filewriter/filewriter.cc:548
+msgid "VBR/ABR"
+msgstr "VBR／ABR"
+
+#: src/filewriter/filewriter.cc:549
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.cc:205
-msgid "Quality level (0 - 10):"
-msgstr "品質等級 (0 - 10)："
+#: src/filewriter/filewriter.cc:559
+msgid "Quality (0-1):"
+msgstr "品質 (0-1)："
+
+#: src/filewriter/filewriter.cc:566 src/skins-qt/skins_cfg.cc:304
+#: src/skins/skins_cfg.cc:286
+msgid "General"
+msgstr "一般"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:35
 msgid "FLAC Decoder"
 msgstr "FLAC 解碼器"
 
-#: src/flacng/metadata.cc:302 src/wavpack/wavpack.cc:211
+#: src/flac/metadata.cc:252 src/wavpack/wavpack.cc:209
 msgid "lossless"
 msgstr "無損"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:169
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1442,7 +1541,7 @@ msgstr ""
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gio/gio.cc:33
+#: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
@@ -1450,19 +1549,19 @@ msgstr ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.cc:41
+#: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO 外掛"
 
-#: src/gio/gio.cc:149
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "不支援讀取並附加的存取模式"
 
-#: src/gio/gio.cc:162
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "無效的開啟模式"
 
-#: src/gl-spectrum/gl-spectrum.cc:52
+#: src/glspectrum/gl-spectrum.cc:51
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1482,32 +1581,10 @@ msgstr ""
 "\n"
 "License: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:63 src/gl-spectrum-qt/gl-spectrum.cc:54
+#: src/glspectrum/gl-spectrum.cc:62 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 頻譜分析儀"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:42
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-msgstr ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"License: GPLv2+"
-
 #: src/gnomeshortcuts/gnomeshortcuts.cc:38
 msgid "GNOME Shortcuts"
 msgstr "Gnome 快速鍵"
@@ -1528,8 +1605,8 @@ msgstr ""
 msgid "Entry number"
 msgstr "項目編號"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:220
-#: src/playlist-manager-qt/playlist-manager-qt.cc:158
+#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:160
 #: src/qtui/playlist_model.cc:124
 msgid "Title"
 msgstr "標題"
@@ -1586,8 +1663,8 @@ msgstr "可用的欄位"
 msgid "Displayed columns"
 msgstr "顯示的欄位"
 
-#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:52
-#: src/search-tool/search-tool.cc:43
+#: src/gtkui/layout.cc:72 src/search-tool-qt/search-tool-qt.cc:51
+#: src/search-tool/search-tool.cc:42
 msgid "Search Tool"
 msgstr "搜尋工具"
 
@@ -1615,335 +1692,338 @@ msgstr "解除嵌入"
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.cc:131 src/qtui/main_window_actions.cc:89
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:55
 #: src/statusicon-qt/statusicon.cc:88 src/statusicon/statusicon.cc:277
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O) ..."
 
-#: src/gtkui/menus.cc:132 src/qtui/main_window_actions.cc:91
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:57
 msgid "Open _URL ..."
 msgstr "開啟網址(_U) ..."
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:92
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:58
 msgid "_Add Files ..."
 msgstr "加入檔案(_A) ... "
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:94
+#: src/gtkui/menus.cc:99 src/qtui/menus.cc:60
 msgid "Add U_RL ..."
 msgstr "加入網址(_R) ..."
 
-#: src/gtkui/menus.cc:136
+#: src/gtkui/menus.cc:101
 msgid "Search _Library"
 msgstr "搜尋媒體櫃(_L)"
 
-#: src/gtkui/menus.cc:138 src/qtui/main_window_actions.cc:96
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:62
 msgid "A_bout ..."
 msgstr "關於(_B) ..."
 
-#: src/gtkui/menus.cc:139 src/qtui/main_window_actions.cc:97
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:63
 msgid "_Settings ..."
 msgstr "設定(_S) ..."
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:101
+#: src/gtkui/menus.cc:105 src/qtui/menus.cc:67
 #: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:285
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:270
-#: src/qtui/main_window_actions.cc:105 src/search-tool-qt/search-tool-qt.cc:685
-#: src/search-tool/search-tool.cc:637 src/statusicon-qt/statusicon.cc:90
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:109 src/gtkui/menus.cc:236 src/qtui/menus.cc:71
+#: src/search-tool-qt/search-tool-qt.cc:707 src/search-tool/search-tool.cc:659
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:279
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:106
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:72
 #: src/statusicon-qt/statusicon.cc:91 src/statusicon/statusicon.cc:280
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:107
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:73
 #: src/statusicon-qt/statusicon.cc:92 src/statusicon/statusicon.cc:281
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:108
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:74
 #: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:278
 msgid "Pre_vious"
 msgstr "上一個(_V)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:109
+#: src/gtkui/menus.cc:113 src/qtui/menus.cc:75
 #: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:282
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: src/gtkui/menus.cc:150 src/qtui/main_window_actions.cc:111
+#: src/gtkui/menus.cc:115 src/qtui/menus.cc:77
 msgid "_Repeat"
 msgstr "重複(_R)"
 
-#: src/gtkui/menus.cc:151 src/qtui/main_window_actions.cc:112
+#: src/gtkui/menus.cc:116 src/qtui/menus.cc:78
 msgid "S_huffle"
 msgstr "亂序(_H)"
 
-#: src/gtkui/menus.cc:152 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:79
 msgid "Shuffle by Albu_m"
 msgstr "以專輯為單位亂序播放(_M)"
 
-#: src/gtkui/menus.cc:153 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:80
 msgid "N_o Playlist Advance"
 msgstr "不要切換播放清單(_O)"
 
-#: src/gtkui/menus.cc:154 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:119 src/qtui/menus.cc:81
 msgid "Stop A_fter This Song"
 msgstr "播放完目前歌曲後停止(_F)"
 
-#: src/gtkui/menus.cc:156 src/gtkui/menus.cc:255
-#: src/qtui/main_window_actions.cc:117
+#: src/gtkui/menus.cc:121 src/gtkui/menus.cc:220 src/qtui/menus.cc:83
+#: src/qtui/menus.cc:167
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I) ..."
 
-#: src/gtkui/menus.cc:157
+#: src/gtkui/menus.cc:122
 msgid "Jump to _Time ..."
 msgstr "跳轉到指定時間(_T) ..."
 
-#: src/gtkui/menus.cc:158
+#: src/gtkui/menus.cc:123
 msgid "_Jump to Song ..."
 msgstr "跳轉到指定歌曲(_J) ..."
 
-#: src/gtkui/menus.cc:160
+#: src/gtkui/menus.cc:125
 msgid "Set Repeat Point _A"
 msgstr "設定重複點 _A"
 
-#: src/gtkui/menus.cc:161
+#: src/gtkui/menus.cc:126
 msgid "Set Repeat Point _B"
 msgstr "設定重複點 _B"
 
-#: src/gtkui/menus.cc:162
+#: src/gtkui/menus.cc:127
 msgid "_Clear Repeat Points"
 msgstr "清除重複點(_C)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:121 src/qtui/main_window_actions.cc:128
-#: src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:138 src/gtkui/menus.cc:154
+#: src/qtui/menus.cc:87 src/qtui/menus.cc:94 src/qtui/menus.cc:110
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.cc:167 src/qtui/main_window_actions.cc:122
+#: src/gtkui/menus.cc:132 src/qtui/menus.cc:88
 msgid "By _File Name"
 msgstr "檔案名稱(_F)"
 
-#: src/gtkui/menus.cc:168 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:133 src/qtui/menus.cc:89
 msgid "By File _Path"
 msgstr "檔案路徑(_P)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:127 src/qtui/main_window_actions.cc:143
+#: src/gtkui/menus.cc:137 src/gtkui/menus.cc:153 src/qtui/menus.cc:93
+#: src/qtui/menus.cc:109
 msgid "By Track _Number"
 msgstr "音軌編號(_N)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:129 src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:155 src/qtui/menus.cc:95
+#: src/qtui/menus.cc:111
 msgid "By _Artist"
 msgstr "藝人(_A)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:140 src/gtkui/menus.cc:156 src/qtui/menus.cc:96
+#: src/qtui/menus.cc:112
 msgid "By Al_bum"
 msgstr "專輯(_B)"
 
-#: src/gtkui/menus.cc:176 src/gtkui/menus.cc:192
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:141 src/gtkui/menus.cc:157 src/qtui/menus.cc:97
+#: src/qtui/menus.cc:113
 msgid "By Albu_m Artist"
 msgstr "專輯藝人(_M)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:142 src/gtkui/menus.cc:158 src/qtui/menus.cc:98
+#: src/qtui/menus.cc:114
 msgid "By Release _Date"
 msgstr "發行日期(_D)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:143 src/gtkui/menus.cc:159 src/qtui/menus.cc:99
+#: src/qtui/menus.cc:115
 msgid "By _Genre"
 msgstr "類型(_G)"
 
-#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:195
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:144 src/gtkui/menus.cc:160 src/qtui/menus.cc:100
+#: src/qtui/menus.cc:116
 msgid "By _Length"
 msgstr "長度(_L)"
 
-#: src/gtkui/menus.cc:180 src/gtkui/menus.cc:196
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:145 src/gtkui/menus.cc:161 src/qtui/menus.cc:101
+#: src/qtui/menus.cc:117
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.cc:181 src/gtkui/menus.cc:197
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:146 src/gtkui/menus.cc:162 src/qtui/menus.cc:102
+#: src/qtui/menus.cc:118
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.cc:183 src/gtkui/menus.cc:199
-#: src/qtui/main_window_actions.cc:138 src/qtui/main_window_actions.cc:154
+#: src/gtkui/menus.cc:148 src/gtkui/menus.cc:164 src/qtui/menus.cc:104
+#: src/qtui/menus.cc:120
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.cc:184 src/gtkui/menus.cc:200
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:149 src/gtkui/menus.cc:165 src/qtui/menus.cc:105
+#: src/qtui/menus.cc:121
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:159
+#: src/gtkui/menus.cc:169 src/qtui/menus.cc:125
 msgid "_Play/Resume"
 msgstr "播放／回復(_P)"
 
-#: src/gtkui/menus.cc:205 src/gtkui/menus.cc:259
-#: src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:126
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: src/gtkui/menus.cc:207 src/qtui/main_window_actions.cc:162
+#: src/gtkui/menus.cc:172 src/qtui/menus.cc:128
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:208 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:129
 msgid "Sort Se_lected"
 msgstr "排序選擇的項目(_L)"
 
-#: src/gtkui/menus.cc:209 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:130
 msgid "Remove _Duplicates"
 msgstr "移除重複的項目(_D)"
 
-#: src/gtkui/menus.cc:210 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:175 src/qtui/menus.cc:131
 msgid "Remove _Unavailable Files"
 msgstr "移除不存在的檔案(_U)"
 
-#: src/gtkui/menus.cc:212 src/playlist-manager/playlist-manager.cc:239
-#: src/playlist-manager-qt/playlist-manager-qt.cc:317
-#: src/qtui/main_window_actions.cc:167
+#: src/gtkui/menus.cc:177 src/playlist-manager/playlist-manager.cc:241
+#: src/playlist-manager-qt/playlist-manager-qt.cc:319 src/qtui/menus.cc:133
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.cc:213 src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:134
 msgid "Ren_ame ..."
 msgstr "重新命名(_A) ..."
 
-#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:272
-#: src/qtui/main_window_actions.cc:169
+#: src/gtkui/menus.cc:179 src/gtkui/menus.cc:238 src/qtui/menus.cc:135
 msgid "Remo_ve"
 msgstr "移除(_V)"
 
-#: src/gtkui/menus.cc:216
+#: src/gtkui/menus.cc:181
 msgid "_Import ..."
 msgstr "匯入(_I) ..."
 
-#: src/gtkui/menus.cc:217
+#: src/gtkui/menus.cc:182
 msgid "_Export ..."
 msgstr "匯出(_E) ..."
 
-#: src/gtkui/menus.cc:219
+#: src/gtkui/menus.cc:184
 msgid "Playlist _Manager ..."
 msgstr "播放清單管理(_M) ..."
 
-#: src/gtkui/menus.cc:220 src/qtui/main_window_actions.cc:175
+#: src/gtkui/menus.cc:185 src/qtui/menus.cc:141
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q) ..."
 
-#: src/gtkui/menus.cc:224 src/qtui/main_window_actions.cc:179
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:145
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.cc:225 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:146
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.cc:227 src/qtui/main_window_actions.cc:182
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:148
 msgid "_Equalizer ..."
 msgstr "等化器(_E) ..."
 
-#: src/gtkui/menus.cc:228 src/qtui/main_window_actions.cc:184
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:150
 msgid "E_ffects ..."
 msgstr "特效(_F) ..."
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:195
 msgid "_Record Stream"
 msgstr "錄製串流(_R)"
 
-#: src/gtkui/menus.cc:231
+#: src/gtkui/menus.cc:196
 msgid "Audio _Settings ..."
 msgstr "音訊設定(_S) ..."
 
-#: src/gtkui/menus.cc:235
+#: src/gtkui/menus.cc:200
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.cc:236
+#: src/gtkui/menus.cc:201
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.cc:237
+#: src/gtkui/menus.cc:202
 msgid "Show Info Bar Vis_ualization"
 msgstr "顯示資訊列的視覺特效(_U)"
 
-#: src/gtkui/menus.cc:238
+#: src/gtkui/menus.cc:203
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.cc:240
+#: src/gtkui/menus.cc:205
 msgid "Show _Remaining Time"
 msgstr "顯示剩餘時間(_R)"
 
-#: src/gtkui/menus.cc:242 src/skins/menus.cc:178 src/skins-qt/menus.cc:171
+#: src/gtkui/menus.cc:207 src/skins/menus.cc:180 src/skins-qt/menus.cc:174
 msgid "_Visualizations ..."
 msgstr "視覺特效(_V) ..."
 
-#: src/gtkui/menus.cc:246 src/qtui/main_window_actions.cc:188
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:154
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.cc:247 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:212 src/qtui/menus.cc:155
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:248 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:156
 msgid "P_laylist"
 msgstr "播放清單(_L)"
 
-#: src/gtkui/menus.cc:249 src/gtkui/menus.cc:266
-#: src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:214 src/gtkui/menus.cc:232 src/qtui/menus.cc:157
+#: src/qtui/menus.cc:179
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.cc:250 src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:215 src/qtui/menus.cc:158
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.cc:251
+#: src/gtkui/menus.cc:216
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:221 src/qtui/menus.cc:168
 msgid "_Queue/Unqueue"
 msgstr "排入／移出佇列(_Q)"
 
-#: src/gtkui/menus.cc:258
+#: src/gtkui/menus.cc:223 src/qtui/menus.cc:170
 msgid "_Open Containing Folder"
 msgstr "開啟該資料夾(_O)"
 
-#: src/gtkui/menus.cc:261
+#: src/gtkui/menus.cc:224 src/qtui/menus.cc:171
+msgid "_Refresh Selected"
+msgstr "重新整理選擇的項目(_R)"
+
+#: src/gtkui/menus.cc:226 src/qtui/menus.cc:173
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.cc:262
+#: src/gtkui/menus.cc:227 src/qtui/menus.cc:174
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:228 src/qtui/menus.cc:175
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.cc:264
+#: src/gtkui/menus.cc:229 src/qtui/menus.cc:176
+msgid "Paste at _End"
+msgstr "貼到最後(_E)"
+
+#: src/gtkui/menus.cc:230 src/qtui/menus.cc:177
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.cc:271
+#: src/gtkui/menus.cc:237
 msgid "_Rename ..."
 msgstr "重新命名(_R) ..."
 
@@ -1984,57 +2064,56 @@ msgstr "按下方向鍵時跳轉的時間長度："
 msgid "Scroll on song change"
 msgstr "切換歌曲時捲動清單"
 
-#: src/gtkui/ui_gtk.cc:72
+#: src/gtkui/ui_gtk.cc:76
 msgid "GTK Interface"
 msgstr "GTK 介面"
 
-#: src/gtkui/ui_gtk.cc:223 src/skins/main.cc:215 src/skins-qt/main.cc:212
+#: src/gtkui/ui_gtk.cc:224 src/skins/main.cc:219 src/skins-qt/main.cc:214
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:237
+#: src/gtkui/ui_gtk.cc:226 src/qtui/main_window.cc:256
 msgid "Buffering ..."
 msgstr "緩衝中 ..."
 
-#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:217 src/skins/main.cc:1103
-#: src/skins-qt/main.cc:214 src/skins-qt/main.cc:1059
+#: src/gtkui/ui_gtk.cc:229 src/skins/main.cc:221 src/skins-qt/main.cc:216
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:69
 msgid "mono"
 msgstr "單聲道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:71
 msgid "stereo"
 msgstr "立體聲"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:73
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d 聲道"
 
-#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:79
+#: src/gtkui/ui_statusbar.cc:75 src/qtui/status_bar.cc:81
 #, c-format
 msgid "%d kHz"
 msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:87
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:443 src/skins-qt/main.cc:426
+#: src/gtkui/ui_statusbar.cc:107 src/skins/main.cc:452 src/skins-qt/main.cc:433
 msgid "Single mode."
 msgstr "單一模式。"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:445 src/skins-qt/main.cc:428
+#: src/gtkui/ui_statusbar.cc:109 src/skins/main.cc:454 src/skins-qt/main.cc:435
 msgid "Playlist mode."
 msgstr "播放清單模式。"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:451 src/skins-qt/main.cc:434
+#: src/gtkui/ui_statusbar.cc:117 src/skins/main.cc:460 src/skins-qt/main.cc:441
 msgid "Stopping after song."
 msgstr "播放完成後停止。"
 
@@ -2042,9 +2121,9 @@ msgstr "播放完成後停止。"
 msgid "Previous track"
 msgstr "上一個音軌"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:90
-#: src/qtui/main_window.cc:197 src/qtui/main_window.cc:198
-#: src/skins/menus.cc:132 src/skins-qt/menus.cc:119
+#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:100
+#: src/qtui/main_window.cc:216 src/qtui/main_window.cc:217
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:122
 msgid "Play"
 msgstr "播放"
 
@@ -2052,8 +2131,8 @@ msgstr "播放"
 msgid "Pause/Resume"
 msgstr "暫停／回復"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:91 src/skins/menus.cc:134
-#: src/skins-qt/menus.cc:121
+#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:101 src/skins/menus.cc:136
+#: src/skins-qt/menus.cc:124
 msgid "Stop"
 msgstr "停止"
 
@@ -2152,7 +2231,7 @@ msgstr "<b>按鍵綁定：</b>"
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: src/hotkey/plugin.cc:62
+#: src/hotkey/plugin.cc:61
 msgid "Global Hotkeys"
 msgstr "全域熱鍵"
 
@@ -2182,36 +2261,36 @@ msgstr ""
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:50
+#: src/jack/jack-ng.cc:50
 msgid "JACK Output"
 msgstr "JACK 輸出"
 
-#: src/jack-ng/jack-ng.cc:115
+#: src/jack/jack-ng.cc:115
 msgid "Automatically connect to output ports"
 msgstr "自動連接到輸出埠"
 
-#: src/jack-ng/jack-ng.cc:156
+#: src/jack/jack-ng.cc:156
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "只找到 %d 個 JACK 輸出埠，但系統需要 %d 個。"
 
-#: src/jack-ng/jack-ng.cc:172
+#: src/jack/jack-ng.cc:172
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "無法連接到 JACK 埠 %s 。"
 
-#: src/jack-ng/jack-ng.cc:192
+#: src/jack/jack-ng.cc:192
 msgid ""
 "JACK supports only floating-point audio.  You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 "JACK 只支援浮點數音訊。您必須在 Audacious 設定中將輸出的取樣格式改為浮點數。"
 
-#: src/jack-ng/jack-ng.cc:205
+#: src/jack/jack-ng.cc:205
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "無法連接到 JACK 伺服器。請確認它是否正常運作。"
 
-#: src/jack-ng/jack-ng.cc:281
+#: src/jack/jack-ng.cc:281
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2313,48 +2392,48 @@ msgstr "重新連線到 LIRC 伺服器"
 msgid "Wait before reconnecting:"
 msgstr "重新連線前的等待時間："
 
-#: src/lyricwiki/lyricwiki.cc:42 src/lyricwiki-qt/lyricwiki.cc:69
+#: src/lyricwiki/lyricwiki.cc:41 src/lyricwiki-qt/lyricwiki.cc:68
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki 歌詞外掛"
 
-#: src/lyricwiki/lyricwiki.cc:132 src/lyricwiki-qt/lyricwiki.cc:150
+#: src/lyricwiki/lyricwiki.cc:134 src/lyricwiki-qt/lyricwiki.cc:152
 msgid "No lyrics available"
 msgstr "無可用的歌詞"
 
-#: src/lyricwiki/lyricwiki.cc:254 src/lyricwiki/lyricwiki.cc:263
-#: src/lyricwiki/lyricwiki.cc:280 src/lyricwiki/lyricwiki.cc:289
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:271
-#: src/lyricwiki-qt/lyricwiki.cc:280 src/lyricwiki-qt/lyricwiki.cc:297
-#: src/lyricwiki-qt/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:256 src/lyricwiki/lyricwiki.cc:265
+#: src/lyricwiki/lyricwiki.cc:282 src/lyricwiki/lyricwiki.cc:291
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:273
+#: src/lyricwiki-qt/lyricwiki.cc:282 src/lyricwiki-qt/lyricwiki.cc:299
+#: src/lyricwiki-qt/lyricwiki.cc:308 src/lyricwiki-qt/lyricwiki.cc:323
 #: src/qtui/dialog_windows.cc:38
 msgid "Error"
 msgstr "錯誤"
 
-#: src/lyricwiki/lyricwiki.cc:255 src/lyricwiki/lyricwiki.cc:281
-#: src/lyricwiki-qt/lyricwiki.cc:272 src/lyricwiki-qt/lyricwiki.cc:298
+#: src/lyricwiki/lyricwiki.cc:257 src/lyricwiki/lyricwiki.cc:283
+#: src/lyricwiki-qt/lyricwiki.cc:274 src/lyricwiki-qt/lyricwiki.cc:300
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "無法取得 %s"
 
-#: src/lyricwiki/lyricwiki.cc:264 src/lyricwiki/lyricwiki.cc:290
-#: src/lyricwiki-qt/lyricwiki.cc:281 src/lyricwiki-qt/lyricwiki.cc:307
+#: src/lyricwiki/lyricwiki.cc:266 src/lyricwiki/lyricwiki.cc:292
+#: src/lyricwiki-qt/lyricwiki.cc:283 src/lyricwiki-qt/lyricwiki.cc:309
 #, c-format
 msgid "Unable to parse %s"
 msgstr "無法分析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:296 src/lyricwiki-qt/lyricwiki.cc:313
+#: src/lyricwiki/lyricwiki.cc:298 src/lyricwiki-qt/lyricwiki.cc:315
 msgid "Looking for lyrics ..."
 msgstr "尋找歌詞中 ..."
 
-#: src/lyricwiki/lyricwiki.cc:304 src/lyricwiki-qt/lyricwiki.cc:321
+#: src/lyricwiki/lyricwiki.cc:306 src/lyricwiki-qt/lyricwiki.cc:323
 msgid "Missing song metadata"
 msgstr "找不到歌曲詮釋資料"
 
-#: src/lyricwiki/lyricwiki.cc:315 src/lyricwiki-qt/lyricwiki.cc:332
+#: src/lyricwiki/lyricwiki.cc:317 src/lyricwiki-qt/lyricwiki.cc:334
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "連線到 lyrics.wikia.com 中 ..."
 
-#: src/lyricwiki/lyricwiki.cc:356 src/lyricwiki-qt/lyricwiki.cc:410
+#: src/lyricwiki/lyricwiki.cc:358 src/lyricwiki-qt/lyricwiki.cc:412
 msgid "Edit lyrics ..."
 msgstr "編輯歌詞 ..."
 
@@ -2366,17 +2445,17 @@ msgstr "M3U 播放清單"
 msgid "Tact Generator"
 msgstr "節拍產生器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "節拍產生器：%d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "節拍產生器：%d bpm %d／%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:234
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2531,15 +2610,15 @@ msgstr "這些設定值將在 Audacious 重新啟動後生效。"
 msgid "MPG123 Plugin"
 msgstr "MPG123 外掛"
 
-#: src/mpg123/mpg123.cc:82
+#: src/mpg123/mpg123.cc:80
 msgid "<b>Advanced</b>"
 msgstr "<b>進階</b>"
 
-#: src/mpg123/mpg123.cc:83
+#: src/mpg123/mpg123.cc:81
 msgid "Use accurate length calculation (slow)"
 msgstr "啟用精確長度計算(慢)"
 
-#: src/mpg123/mpg123.cc:243
+#: src/mpg123/mpg123.cc:245
 msgid "Surround"
 msgstr "環繞"
 
@@ -2551,35 +2630,35 @@ msgstr "MPRIS 2 伺服器"
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP／HTTPS 外掛"
 
-#: src/neon/neon.cc:523
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "解析重新導向時發生錯誤"
 
-#: src/neon/neon.cc:537
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "發生未知的 HTTP 錯誤"
 
-#: src/neon/neon.cc:571
+#: src/neon/neon.cc:574
 msgid "Error parsing URL"
 msgstr "解析網址時發生錯誤"
 
-#: src/neon/neon.cc:634
+#: src/neon/neon.cc:637
 msgid "Too many redirects"
 msgstr "過多的重新導向"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:95
 msgid "Audacious is not playing."
 msgstr "Audacious 非播放中。"
 
-#: src/notify/notify.cc:43
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面通知"
 
-#: src/notify/notify.cc:61
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2615,15 +2694,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:108
+#: src/notify/notify.cc:102
 msgid "Show playback controls"
 msgstr "顯示播放控制元件"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Always show notification"
 msgstr "永遠顯示通知"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Include album name in notification"
 msgstr "在通知訊息中顯示專輯名稱"
 
@@ -2631,21 +2710,21 @@ msgstr "在通知訊息中顯示專輯名稱"
 msgid "Show"
 msgstr "顯示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:203 src/qtui/main_window.cc:204
-#: src/skins/menus.cc:133 src/skins-qt/menus.cc:120
+#: src/notify/osd.cc:66 src/qtui/main_window.cc:222 src/qtui/main_window.cc:223
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:123
 msgid "Pause"
 msgstr "暫停"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:93 src/skins/menus.cc:136
-#: src/skins-qt/menus.cc:123
+#: src/notify/osd.cc:73 src/qtui/main_window.cc:103 src/skins/menus.cc:138
+#: src/skins-qt/menus.cc:126
 msgid "Next"
 msgstr "下一個"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:75
 msgid "OSS4 Output"
 msgstr "OSS4 輸出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:77
 msgid "OSS3 Output"
 msgstr "OSS3 輸出"
 
@@ -2687,23 +2766,23 @@ msgstr ""
 "I would like to thank people on #audacious, especially Tony Vroon and John "
 "Lindgren and of course the authors of the previous OSS plugin."
 
-#: src/playlist-manager/playlist-manager.cc:38
-#: src/playlist-manager-qt/playlist-manager-qt.cc:41
+#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager-qt/playlist-manager-qt.cc:40
 msgid "Playlist Manager"
 msgstr "播放清單管理"
 
-#: src/playlist-manager/playlist-manager.cc:221
-#: src/playlist-manager-qt/playlist-manager-qt.cc:160
+#: src/playlist-manager/playlist-manager.cc:223
+#: src/playlist-manager-qt/playlist-manager-qt.cc:162
 msgid "Entries"
 msgstr "項目數"
 
-#: src/playlist-manager/playlist-manager.cc:241
-#: src/playlist-manager-qt/playlist-manager-qt.cc:325
+#: src/playlist-manager/playlist-manager.cc:243
+#: src/playlist-manager-qt/playlist-manager-qt.cc:327
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:242
-#: src/playlist-manager-qt/playlist-manager-qt.cc:320
+#: src/playlist-manager/playlist-manager.cc:244
+#: src/playlist-manager-qt/playlist-manager-qt.cc:322
 msgid "Ren_ame"
 msgstr "重新命名(_A)"
 
@@ -2715,51 +2794,49 @@ msgstr "PLS 播放清單"
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1／PSF2 解碼器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:40
 msgid "PulseAudio Output"
 msgstr "PulseAudio 輸出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:494
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "Audacious PulseAudio Output Plugin\n"
 "\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"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\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"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:44
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 輸出"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:72
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2773,47 +2850,73 @@ msgstr ""
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+
 #: src/qtui/dialog_windows.cc:31
 msgid "Working ..."
 msgstr "處理中 ..."
 
+#: src/qtui/dialog_windows.cc:43
+msgid "Information"
+msgstr "資訊"
+
 #: src/qtui/filter_input.cc:44 src/skins/search-select.cc:76
 msgid "Search"
 msgstr "搜尋"
 
-#: src/qtui/main_window_actions.cc:90
-msgid "_Open Folder ..."
-msgstr "開啟資料夾(_O) ..."
-
-#: src/qtui/main_window_actions.cc:93
-msgid "_Add Folder ..."
-msgstr "加入資料夾(_A) ..."
-
-#: src/qtui/main_window_actions.cc:99
-msgid "_Log Inspector ..."
-msgstr "監控記錄(_L) ..."
-
-#: src/qtui/main_window.cc:85
+#: src/qtui/main_window.cc:95
 msgid "Open Files"
 msgstr "開啟檔案"
 
-#: src/qtui/main_window.cc:87
+#: src/qtui/main_window.cc:97
 msgid "Add Files"
 msgstr "加入檔案"
 
-#: src/qtui/main_window.cc:92 src/skins/menus.cc:135 src/skins-qt/menus.cc:122
+#: src/qtui/main_window.cc:102 src/skins/menus.cc:137 src/skins-qt/menus.cc:125
 msgid "Previous"
 msgstr "上一個"
 
-#: src/qtui/main_window.cc:98 src/skins/menus.cc:126 src/skins-qt/menus.cc:113
+#: src/qtui/main_window.cc:108 src/skins/menus.cc:128 src/skins-qt/menus.cc:116
 msgid "Repeat"
 msgstr "重複"
 
-#: src/qtui/main_window.cc:100 src/skins/menus.cc:127 src/skins-qt/menus.cc:114
+#: src/qtui/main_window.cc:110 src/skins/menus.cc:129 src/skins-qt/menus.cc:117
 msgid "Shuffle"
 msgstr "隨機"
 
-#: src/qtui/qtui.cc:39
+#: src/qtui/menus.cc:56
+msgid "_Open Folder ..."
+msgstr "開啟資料夾(_O) ..."
+
+#: src/qtui/menus.cc:59
+msgid "_Add Folder ..."
+msgstr "加入資料夾(_A) ..."
+
+#: src/qtui/menus.cc:65
+msgid "_Log Inspector ..."
+msgstr "監控記錄(_L) ..."
+
+#: src/qtui/qtui.cc:42
 msgid "Qt Interface"
 msgstr "Qt 介面"
 
@@ -2857,7 +2960,7 @@ msgstr "<b>轉換</b>"
 msgid "Method:"
 msgstr "演算法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:162
 msgid "Rate:"
 msgstr "取樣率："
 
@@ -2909,55 +3012,45 @@ msgstr "176.4 kHz："
 msgid "192 kHz:"
 msgstr "192 kHz："
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "確認。上傳使用者 %s 的播放資訊"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "存取被拒"
+#: src/scrobbler2/config_window.cc:19
+msgid "Checking Last.fm access ..."
+msgstr "正在檢查 Last.fm 存取權限 ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "點選下列連結允許 Audacious 上傳您的播放資訊："
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "請保持這個視窗的開啟並再次點選「檢查權限」。\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:27
 msgid ""
-"Don't worry. Your scrobbles are saved on your computer.\n"
-"They will be submitted as soon as Audacious is allowed to do so."
+"Your scrobbles are being saved on your computer temporarily.  They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"別擔心。您的資訊已經儲存在電腦上。\n"
-"Audacious 會在狀況允許下盡快地將它們上傳。"
+"您的播放記錄已暫時儲存在電腦上。Audacious 會在狀況允許下盡快地將它們上傳。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "網路發生問題。"
+#: src/scrobbler2/config_window.cc:33
+#, c-format
+msgid "Permission granted.  Scrobbling for user %s."
+msgstr "已取得授權。上傳使用者 %s 的播放記錄。"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "存取 Last.fm 時發生問題。請稍候再試。"
+#: src/scrobbler2/config_window.cc:37
+msgid ""
+"Permission denied.  Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"存取被拒。請用瀏覽器開啟以下連結並允許 Audacious 存取您的帳號，然後再點一次"
+"「檢查授權」："
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "檢查中..."
+#: src/scrobbler2/config_window.cc:47
+msgid "There was a problem contacting Last.fm."
+msgstr "存取 Last.fm 時發生問題。"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "檢查權限(_H)"
+#: src/scrobbler2/config_window.cc:86
+msgid "Check Permission"
+msgstr "檢查授權"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "撤銷授權(_R)"
+#: src/scrobbler2/config_window.cc:87
+msgid "Revoke Permission"
+msgstr "撤銷授權"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "您需要允許 Audacious 上傳音軌的播放資訊到您的 Last.fm 帳號。\n"
+#: src/scrobbler2/config_window.cc:91
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "您必須允許 Audacious 上傳音軌的播放記錄到您的 Last.fm 帳號。"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
@@ -2989,7 +3082,7 @@ msgstr ""
 "project.\n"
 "\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
+#: src/scrobbler2/scrobbler_communication.cc:638
 msgid ""
 "Audacious is now using an improved version of the Last.fm Scrobbler.\n"
 "Please check the Preferences for the Scrobbler plugin."
@@ -2997,11 +3090,11 @@ msgstr ""
 "Audacious 現在使用改良版的 Last.fm 播放資訊上傳功能。\n"
 "請參閱偏好設定中的播放資訊外掛。"
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 輸出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3009,66 +3102,66 @@ msgstr ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool-qt/search-tool-qt.cc:193
-#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:126
-#: src/search-tool/search-tool.cc:134
+#: src/search-tool-qt/search-tool-qt.cc:195
+#: src/search-tool-qt/search-tool-qt.cc:203 src/search-tool/search-tool.cc:128
+#: src/search-tool/search-tool.cc:136
 msgid "Library"
 msgstr "媒體櫃"
 
-#: src/search-tool-qt/search-tool-qt.cc:474 src/search-tool/search-tool.cc:407
+#: src/search-tool-qt/search-tool-qt.cc:485 src/search-tool/search-tool.cc:418
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d 項結果"
 
-#: src/search-tool-qt/search-tool-qt.cc:480 src/search-tool/search-tool.cc:413
+#: src/search-tool-qt/search-tool-qt.cc:491 src/search-tool/search-tool.cc:424
 #, c-format
 msgid "(%d hidden)"
 msgid_plural "(%d hidden)"
 msgstr[0] "(%d 項隱藏)"
 
-#: src/search-tool-qt/search-tool-qt.cc:661 src/search-tool/search-tool.cc:590
+#: src/search-tool-qt/search-tool-qt.cc:683 src/search-tool/search-tool.cc:612
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d 首歌曲"
 
-#: src/search-tool-qt/search-tool-qt.cc:668 src/search-tool/search-tool.cc:597
+#: src/search-tool-qt/search-tool-qt.cc:690 src/search-tool/search-tool.cc:619
 msgid "of this genre"
 msgstr "符合此分類"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "on"
 msgstr "收錄於"
 
-#: src/search-tool-qt/search-tool-qt.cc:674 src/search-tool/search-tool.cc:603
+#: src/search-tool-qt/search-tool-qt.cc:696 src/search-tool/search-tool.cc:625
 msgid "by"
 msgstr "-"
 
-#: src/search-tool-qt/search-tool-qt.cc:686 src/search-tool/search-tool.cc:639
+#: src/search-tool-qt/search-tool-qt.cc:708 src/search-tool/search-tool.cc:661
 msgid "_Create Playlist"
 msgstr "建立播放清單(_C)"
 
-#: src/search-tool-qt/search-tool-qt.cc:687 src/search-tool/search-tool.cc:641
+#: src/search-tool-qt/search-tool-qt.cc:709 src/search-tool/search-tool.cc:663
 msgid "_Add to Playlist"
 msgstr "加到播放清單(_A)"
 
-#: src/search-tool-qt/search-tool-qt.cc:703 src/search-tool/search-tool.cc:682
+#: src/search-tool-qt/search-tool-qt.cc:725 src/search-tool/search-tool.cc:752
 msgid "Search library"
 msgstr "搜尋媒體櫃"
 
-#: src/search-tool-qt/search-tool-qt.cc:706 src/search-tool/search-tool.cc:686
+#: src/search-tool-qt/search-tool-qt.cc:728 src/search-tool/search-tool.cc:756
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "要將您的媒體櫃匯入 Audacious，請選擇目標資料夾並且按下 \"重新整理\" 圖示。"
 
-#: src/search-tool-qt/search-tool-qt.cc:712 src/search-tool/search-tool.cc:695
+#: src/search-tool-qt/search-tool-qt.cc:734 src/search-tool/search-tool.cc:765
 msgid "Please wait ..."
 msgstr "請稍候 ..."
 
-#: src/search-tool/search-tool.cc:722
+#: src/search-tool/search-tool.cc:793
 msgid "Choose Folder"
 msgstr "選擇資料夾"
 
@@ -3164,15 +3257,15 @@ msgstr "閥值："
 msgid "dB"
 msgstr "dB"
 
-#: src/skins/actions.cc:43 src/skins-qt/actions.cc:41
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
 msgid "Repeat points cleared."
 msgstr "已清除重複點。"
 
-#: src/skins/actions.cc:58 src/skins-qt/actions.cc:56
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
 msgid "Repeat point A set."
 msgstr "已設定重複點 A。"
 
-#: src/skins/actions.cc:63 src/skins-qt/actions.cc:61
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
 msgid "Repeat point B set."
 msgstr "已設定重複點 B。"
 
@@ -3224,373 +3317,381 @@ msgstr "16 kHz"
 msgid "Audacious Equalizer"
 msgstr "Audacious 等化器"
 
-#: src/skins/main.cc:686 src/skins-qt/main.cc:641
+#: src/skins/main.cc:695 src/skins-qt/main.cc:648
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "移動到 %d:%-2.2d／%d:%-2.2d"
 
-#: src/skins/main.cc:703 src/skins-qt/main.cc:658
+#: src/skins/main.cc:712 src/skins-qt/main.cc:665
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量：%d％"
 
-#: src/skins/main.cc:716 src/skins-qt/main.cc:671
+#: src/skins/main.cc:725 src/skins-qt/main.cc:678
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡：%d％ 偏左"
 
-#: src/skins/main.cc:718 src/skins-qt/main.cc:673
+#: src/skins/main.cc:727 src/skins-qt/main.cc:680
 msgid "Balance: center"
 msgstr "平衡：中間"
 
-#: src/skins/main.cc:720 src/skins-qt/main.cc:675
+#: src/skins/main.cc:729 src/skins-qt/main.cc:682
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡：%d％ 偏右"
 
-#: src/skins/main.cc:813 src/skins-qt/main.cc:768
+#: src/skins/main.cc:822 src/skins-qt/main.cc:775
 msgid "Options Menu"
 msgstr "選單選項"
 
-#: src/skins/main.cc:817 src/skins-qt/main.cc:772
+#: src/skins/main.cc:826 src/skins-qt/main.cc:779
 msgid "Disable 'Always On Top'"
 msgstr "關閉置頂"
 
-#: src/skins/main.cc:819 src/skins-qt/main.cc:774
+#: src/skins/main.cc:828 src/skins-qt/main.cc:781
 msgid "Enable 'Always On Top'"
 msgstr "啟用置頂"
 
-#: src/skins/main.cc:822 src/skins-qt/main.cc:777
+#: src/skins/main.cc:831 src/skins-qt/main.cc:784
 msgid "File Info Box"
 msgstr "檔案資訊視窗"
 
-#: src/skins/main.cc:825 src/skins/menus.cc:170 src/skins-qt/main.cc:780
-#: src/skins-qt/menus.cc:161
+#: src/skins/main.cc:834 src/skins/menus.cc:172 src/skins-qt/main.cc:787
+#: src/skins-qt/menus.cc:164
 msgid "Double Size"
 msgstr "兩倍大小"
 
-#: src/skins/main.cc:828 src/skins-qt/main.cc:783
+#: src/skins/main.cc:837 src/skins-qt/main.cc:790
 msgid "Visualizations"
 msgstr "視覺特效"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording on"
 msgstr "錄音開啟"
 
-#: src/skins/menus.cc:78 src/skins-qt/menus.cc:64
+#: src/skins/menus.cc:80 src/skins-qt/menus.cc:67
 msgid "Recording off"
 msgstr "錄音關閉"
 
-#: src/skins/menus.cc:97 src/skins-qt/menus.cc:83
+#: src/skins/menus.cc:99 src/skins-qt/menus.cc:86
 msgid "Volume Up"
 msgstr "提高音量"
 
-#: src/skins/menus.cc:98 src/skins-qt/menus.cc:84
+#: src/skins/menus.cc:100 src/skins-qt/menus.cc:87
 msgid "Volume Down"
 msgstr "降低音量"
 
-#: src/skins/menus.cc:100 src/skins-qt/menus.cc:86
+#: src/skins/menus.cc:102 src/skins-qt/menus.cc:89
 msgid "Effects ..."
 msgstr "特效 ..."
 
-#: src/skins/menus.cc:102 src/skins-qt/menus.cc:88
+#: src/skins/menus.cc:104 src/skins-qt/menus.cc:91
 msgid "Record Stream"
 msgstr "錄音"
 
-#: src/skins/menus.cc:103 src/skins-qt/menus.cc:89
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:92
 msgid "Audio Settings ..."
 msgstr "音訊設定 ..."
 
-#: src/skins/menus.cc:107 src/skins-qt/menus.cc:93
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:96
 msgid "Open Files ..."
 msgstr "開啟檔案 ..."
 
-#: src/skins/menus.cc:108 src/skins-qt/menus.cc:95
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:98
 msgid "Open URL ..."
 msgstr "開啟網址 ..."
 
-#: src/skins/menus.cc:109
+#: src/skins/menus.cc:111
 msgid "Search Library"
 msgstr "搜尋媒體櫃"
 
-#: src/skins/menus.cc:111 src/skins-qt/menus.cc:98
+#: src/skins/menus.cc:113 src/skins-qt/menus.cc:101
 msgid "Playback"
 msgstr "播放"
 
-#: src/skins/menus.cc:112 src/skins-qt/menus.cc:99
+#: src/skins/menus.cc:114 src/skins-qt/menus.cc:102
 msgid "Playlist"
 msgstr "播放清單"
 
-#: src/skins/menus.cc:113 src/skins-qt/menus.cc:100
+#: src/skins/menus.cc:115 src/skins-qt/menus.cc:103
 msgid "Output"
 msgstr "輸出"
 
-#: src/skins/menus.cc:114 src/skins-qt/menus.cc:101
+#: src/skins/menus.cc:116 src/skins-qt/menus.cc:104
 msgid "View"
 msgstr "檢視"
 
-#: src/skins/menus.cc:116 src/skins/menus.cc:182 src/skins/menus.cc:195
-#: src/skins/menus.cc:260 src/skins-qt/menus.cc:103 src/skins-qt/menus.cc:175
-#: src/skins-qt/menus.cc:189 src/skins-qt/menus.cc:254
+#: src/skins/menus.cc:118 src/skins/menus.cc:184 src/skins/menus.cc:197
+#: src/skins/menus.cc:264 src/skins-qt/menus.cc:106 src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:192 src/skins-qt/menus.cc:257
 msgid "Services"
 msgstr "服務"
 
-#: src/skins/menus.cc:118 src/skins-qt/menus.cc:105
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:108
 msgid "About ..."
 msgstr "關於 ..."
 
-#: src/skins/menus.cc:119 src/skins-qt/menus.cc:106
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:109
 msgid "Settings ..."
 msgstr "設定 ..."
 
-#: src/skins/menus.cc:120 src/skins-qt/menus.cc:107
+#: src/skins/menus.cc:122 src/skins-qt/menus.cc:110
 msgid "Quit"
 msgstr "離開"
 
-#: src/skins/menus.cc:124 src/skins/menus.cc:252 src/skins-qt/menus.cc:111
-#: src/skins-qt/menus.cc:244
+#: src/skins/menus.cc:126 src/skins/menus.cc:254 src/skins-qt/menus.cc:114
+#: src/skins-qt/menus.cc:247
 msgid "Song Info ..."
 msgstr "歌曲資訊 ..."
 
-#: src/skins/menus.cc:128 src/skins-qt/menus.cc:115
+#: src/skins/menus.cc:130 src/skins-qt/menus.cc:118
 msgid "Shuffle by Album"
 msgstr "以專輯為單位亂序播放"
 
-#: src/skins/menus.cc:129 src/skins-qt/menus.cc:116
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:119
 msgid "No Playlist Advance"
 msgstr "不要切換播放清單"
 
-#: src/skins/menus.cc:130 src/skins-qt/menus.cc:117
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:120
 msgid "Stop After This Song"
 msgstr "播放完目前歌曲後停止"
 
-#: src/skins/menus.cc:138 src/skins-qt/menus.cc:125
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:128
 msgid "Set A-B Repeat"
 msgstr "設定 A-B 循環"
 
-#: src/skins/menus.cc:139 src/skins-qt/menus.cc:126
+#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
 msgid "Clear A-B Repeat"
 msgstr "清除 A-B 循環"
 
-#: src/skins/menus.cc:141 src/skins-qt/menus.cc:129
+#: src/skins/menus.cc:143 src/skins-qt/menus.cc:132
 msgid "Jump to Song ..."
 msgstr "跳轉到指定歌曲 ..."
 
-#: src/skins/menus.cc:142 src/skins-qt/menus.cc:130
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:133
 msgid "Jump to Time ..."
 msgstr "跳轉到指定時間 ..."
 
-#: src/skins/menus.cc:146 src/skins-qt/menus.cc:135
+#: src/skins/menus.cc:148 src/skins-qt/menus.cc:138
 msgid "Play/Resume"
 msgstr "播放／回復"
 
-#: src/skins/menus.cc:148 src/skins-qt/menus.cc:137
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:140
 msgid "New Playlist"
 msgstr "新增播放清單"
 
-#: src/skins/menus.cc:149 src/skins-qt/menus.cc:138
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:141
 msgid "Rename Playlist ..."
 msgstr "重新命名播放清單 ..."
 
-#: src/skins/menus.cc:150 src/skins-qt/menus.cc:139
+#: src/skins/menus.cc:152 src/skins-qt/menus.cc:142
 msgid "Remove Playlist"
 msgstr "移除播放清單"
 
-#: src/skins/menus.cc:152 src/skins-qt/menus.cc:141
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:144
 msgid "Previous Playlist"
 msgstr "上一個播放清單"
 
-#: src/skins/menus.cc:153 src/skins-qt/menus.cc:142
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
 msgid "Next Playlist"
 msgstr "下一個播放清單"
 
-#: src/skins/menus.cc:155 src/skins-qt/menus.cc:145
+#: src/skins/menus.cc:157 src/skins-qt/menus.cc:148
 msgid "Import Playlist ..."
 msgstr "匯入播放清單 ..."
 
-#: src/skins/menus.cc:156 src/skins-qt/menus.cc:146
+#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
 msgid "Export Playlist ..."
 msgstr "匯出播放清單 ..."
 
-#: src/skins/menus.cc:158 src/skins-qt/menus.cc:149
+#: src/skins/menus.cc:160 src/skins-qt/menus.cc:152
 msgid "Playlist Manager ..."
 msgstr "播放清單管理 ..."
 
-#: src/skins/menus.cc:159 src/skins-qt/menus.cc:150
+#: src/skins/menus.cc:161 src/skins-qt/menus.cc:153
 msgid "Queue Manager ..."
 msgstr "佇列管理 ..."
 
-#: src/skins/menus.cc:161 src/skins-qt/menus.cc:152
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:155
 msgid "Refresh Playlist"
 msgstr "重整播放清單"
 
-#: src/skins/menus.cc:165 src/skins-qt/menus.cc:156
+#: src/skins/menus.cc:167 src/skins-qt/menus.cc:159
 msgid "Show Playlist Editor"
 msgstr "顯示播放清單編輯器"
 
-#: src/skins/menus.cc:166 src/skins-qt/menus.cc:157
+#: src/skins/menus.cc:168 src/skins-qt/menus.cc:160
 msgid "Show Equalizer"
 msgstr "顯示等化器"
 
-#: src/skins/menus.cc:168 src/skins-qt/menus.cc:159
+#: src/skins/menus.cc:170 src/skins-qt/menus.cc:162
 msgid "Show Remaining Time"
 msgstr "顯示剩餘時間"
 
-#: src/skins/menus.cc:171 src/skins-qt/menus.cc:163
+#: src/skins/menus.cc:173 src/skins-qt/menus.cc:166
 msgid "Always on Top"
 msgstr "永遠在最上層"
 
-#: src/skins/menus.cc:172 src/skins-qt/menus.cc:164
+#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
 msgid "On All Workspaces"
 msgstr "在所有工作區顯示"
 
-#: src/skins/menus.cc:174 src/skins-qt/menus.cc:167
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:170
 msgid "Roll Up Player"
 msgstr "捲起播放器"
 
-#: src/skins/menus.cc:175 src/skins-qt/menus.cc:168
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:171
 msgid "Roll Up Playlist Editor"
 msgstr "捲起播放清單編輯器"
 
-#: src/skins/menus.cc:176 src/skins-qt/menus.cc:169
+#: src/skins/menus.cc:178 src/skins-qt/menus.cc:172
 msgid "Roll Up Equalizer"
 msgstr "捲起等化器"
 
-#: src/skins/menus.cc:184 src/skins-qt/menus.cc:177
+#: src/skins/menus.cc:186 src/skins-qt/menus.cc:180
 msgid "Add URL ..."
 msgstr "加入網址 ..."
 
-#: src/skins/menus.cc:185 src/skins-qt/menus.cc:179
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:182
 msgid "Add Files ..."
 msgstr "加入檔案 ... "
 
-#: src/skins/menus.cc:189 src/skins/menus.cc:217 src/skins/menus.cc:231
-#: src/skins-qt/menus.cc:183 src/skins-qt/menus.cc:209
-#: src/skins-qt/menus.cc:223
+#: src/skins/menus.cc:191 src/skins/menus.cc:219 src/skins/menus.cc:233
+#: src/skins-qt/menus.cc:186 src/skins-qt/menus.cc:212
+#: src/skins-qt/menus.cc:226
 msgid "By Title"
 msgstr "標題"
 
-#: src/skins/menus.cc:190 src/skins/menus.cc:224 src/skins/menus.cc:238
-#: src/skins-qt/menus.cc:184 src/skins-qt/menus.cc:216
-#: src/skins-qt/menus.cc:230
+#: src/skins/menus.cc:192 src/skins/menus.cc:226 src/skins/menus.cc:240
+#: src/skins-qt/menus.cc:187 src/skins-qt/menus.cc:219
+#: src/skins-qt/menus.cc:233
 msgid "By File Name"
 msgstr "檔案名稱"
 
-#: src/skins/menus.cc:191 src/skins/menus.cc:225 src/skins/menus.cc:239
-#: src/skins-qt/menus.cc:185 src/skins-qt/menus.cc:217
-#: src/skins-qt/menus.cc:231
+#: src/skins/menus.cc:193 src/skins/menus.cc:227 src/skins/menus.cc:241
+#: src/skins-qt/menus.cc:188 src/skins-qt/menus.cc:220
+#: src/skins-qt/menus.cc:234
 msgid "By File Path"
 msgstr "檔案路徑"
 
-#: src/skins/menus.cc:197 src/skins-qt/menus.cc:191
+#: src/skins/menus.cc:199 src/skins-qt/menus.cc:194
 msgid "Remove All"
 msgstr "全部移除"
 
-#: src/skins/menus.cc:198 src/skins-qt/menus.cc:192
+#: src/skins/menus.cc:200 src/skins-qt/menus.cc:195
 msgid "Clear Queue"
 msgstr "清除佇列"
 
-#: src/skins/menus.cc:200 src/skins-qt/menus.cc:194
+#: src/skins/menus.cc:202 src/skins-qt/menus.cc:197
 msgid "Remove Unavailable Files"
 msgstr "移除無法使用的檔案"
 
-#: src/skins/menus.cc:201 src/skins-qt/menus.cc:195
+#: src/skins/menus.cc:203 src/skins-qt/menus.cc:198
 msgid "Remove Duplicates"
 msgstr "移除重複的項目"
 
-#: src/skins/menus.cc:203 src/skins-qt/menus.cc:197
+#: src/skins/menus.cc:205 src/skins-qt/menus.cc:200
 msgid "Remove Unselected"
 msgstr "移除未選擇的項目"
 
-#: src/skins/menus.cc:204 src/skins-qt/menus.cc:198
+#: src/skins/menus.cc:206 src/skins-qt/menus.cc:201
 msgid "Remove Selected"
 msgstr "移除選擇的項目"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:210
 msgid "Search and Select"
 msgstr "搜尋並選擇"
 
-#: src/skins/menus.cc:210 src/skins-qt/menus.cc:202
+#: src/skins/menus.cc:212 src/skins-qt/menus.cc:205
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/skins/menus.cc:211 src/skins-qt/menus.cc:203
+#: src/skins/menus.cc:213 src/skins-qt/menus.cc:206
 msgid "Select None"
 msgstr "取消選擇"
 
-#: src/skins/menus.cc:212 src/skins-qt/menus.cc:204
+#: src/skins/menus.cc:214 src/skins-qt/menus.cc:207
 msgid "Select All"
 msgstr "選擇全部"
 
-#: src/skins/menus.cc:216 src/skins/menus.cc:230 src/skins-qt/menus.cc:208
-#: src/skins-qt/menus.cc:222
+#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:211
+#: src/skins-qt/menus.cc:225
 msgid "By Track Number"
 msgstr "音軌編號"
 
-#: src/skins/menus.cc:218 src/skins/menus.cc:232 src/skins-qt/menus.cc:210
-#: src/skins-qt/menus.cc:224
+#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:213
+#: src/skins-qt/menus.cc:227
 msgid "By Artist"
 msgstr "藝人"
 
-#: src/skins/menus.cc:219 src/skins/menus.cc:233 src/skins-qt/menus.cc:211
-#: src/skins-qt/menus.cc:225
+#: src/skins/menus.cc:221 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
+#: src/skins-qt/menus.cc:228
 msgid "By Album"
 msgstr "專輯"
 
-#: src/skins/menus.cc:220 src/skins/menus.cc:234 src/skins-qt/menus.cc:212
-#: src/skins-qt/menus.cc:226
+#: src/skins/menus.cc:222 src/skins/menus.cc:236 src/skins-qt/menus.cc:215
+#: src/skins-qt/menus.cc:229
 msgid "By Album Artist"
 msgstr "專輯藝人"
 
-#: src/skins/menus.cc:221 src/skins/menus.cc:236 src/skins-qt/menus.cc:213
-#: src/skins-qt/menus.cc:228
+#: src/skins/menus.cc:223 src/skins/menus.cc:238 src/skins-qt/menus.cc:216
+#: src/skins-qt/menus.cc:231
 msgid "By Release Date"
 msgstr "發行日期"
 
-#: src/skins/menus.cc:222 src/skins/menus.cc:235 src/skins-qt/menus.cc:214
-#: src/skins-qt/menus.cc:227
+#: src/skins/menus.cc:224 src/skins/menus.cc:237 src/skins-qt/menus.cc:217
+#: src/skins-qt/menus.cc:230
 msgid "By Genre"
 msgstr "類型"
 
-#: src/skins/menus.cc:223 src/skins/menus.cc:237 src/skins-qt/menus.cc:215
-#: src/skins-qt/menus.cc:229
+#: src/skins/menus.cc:225 src/skins/menus.cc:239 src/skins-qt/menus.cc:218
+#: src/skins-qt/menus.cc:232
 msgid "By Length"
 msgstr "長度"
 
-#: src/skins/menus.cc:226 src/skins/menus.cc:240 src/skins-qt/menus.cc:218
-#: src/skins-qt/menus.cc:232
+#: src/skins/menus.cc:228 src/skins/menus.cc:242 src/skins-qt/menus.cc:221
+#: src/skins-qt/menus.cc:235
 msgid "By Custom Title"
 msgstr "自訂標題"
 
-#: src/skins/menus.cc:244 src/skins-qt/menus.cc:236
+#: src/skins/menus.cc:246 src/skins-qt/menus.cc:239
 msgid "Randomize List"
 msgstr "清單隨機排序"
 
-#: src/skins/menus.cc:245 src/skins-qt/menus.cc:237
+#: src/skins/menus.cc:247 src/skins-qt/menus.cc:240
 msgid "Reverse List"
 msgstr "清單反向排序"
 
-#: src/skins/menus.cc:247 src/skins-qt/menus.cc:239
+#: src/skins/menus.cc:249 src/skins-qt/menus.cc:242
 msgid "Sort Selected"
 msgstr "排序選擇的項目"
 
-#: src/skins/menus.cc:248 src/skins-qt/menus.cc:240
+#: src/skins/menus.cc:250 src/skins-qt/menus.cc:243
 msgid "Sort List"
 msgstr "排序清單"
 
-#: src/skins/menus.cc:254 src/skins-qt/menus.cc:247
+#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+msgid "Open Containing Folder"
+msgstr "開啟所在的資料夾"
+
+#: src/skins/menus.cc:257 src/skins-qt/menus.cc:250
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/menus.cc:255 src/skins-qt/menus.cc:248
+#: src/skins/menus.cc:258 src/skins-qt/menus.cc:251
 msgid "Copy"
 msgstr "複製"
 
-#: src/skins/menus.cc:256 src/skins-qt/menus.cc:249
+#: src/skins/menus.cc:259 src/skins-qt/menus.cc:252
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/menus.cc:258 src/skins-qt/menus.cc:252
+#: src/skins/menus.cc:260 src/skins-qt/menus.cc:253
+msgid "Paste at End"
+msgstr "貼到最後"
+
+#: src/skins/menus.cc:262 src/skins-qt/menus.cc:255
 msgid "Queue/Unqueue"
 msgstr "排入／移出佇列"
 
@@ -3603,15 +3704,15 @@ msgstr "Audacious 播放清單編輯器"
 msgid "%s (%d of %d)"
 msgstr "%s (%d／%d)"
 
-#: src/skins/plugin.cc:50 src/skins-qt/plugin.cc:52
+#: src/skins/plugin.cc:52 src/skins-qt/plugin.cc:54
 msgid "Winamp Classic Interface"
 msgstr "Winamp 傳統介面"
 
-#: src/skins-qt/menus.cc:94
+#: src/skins-qt/menus.cc:97
 msgid "Open Folder ..."
 msgstr "開啟資料夾 ..."
 
-#: src/skins-qt/menus.cc:178
+#: src/skins-qt/menus.cc:181
 msgid "Add Folder ..."
 msgstr "加入資料夾 ..."
 
@@ -3699,7 +3800,7 @@ msgid "Slow"
 msgstr "慢"
 
 #: src/skins-qt/skins_cfg.cc:241 src/skins/skins_cfg.cc:223
-#: src/sox-resampler/sox-resampler.cc:152
+#: src/soxr/sox-resampler.cc:153
 msgid "Medium"
 msgstr "中等"
 
@@ -3833,7 +3934,7 @@ msgstr "以符合的項目建立新的播放清單"
 msgid "Sndfile Plugin"
 msgstr "Sndfile 外掛"
 
-#: src/sndfile/plugin.cc:361
+#: src/sndfile/plugin.cc:357
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3873,60 +3974,60 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 輸出"
 
-#: src/sndio-ng/sndio.cc:99
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "裝置 (空白表示預設)："
 
-#: src/sndio-ng/sndio.cc:101
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "儲存與還原音量："
 
-#: src/sndio-ng/sndio.cc:182
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio 錯誤：未支援的音訊格式 (%d)"
 
-#: src/sndio-ng/sndio.cc:193
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio 錯誤：sio_open() 失敗"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio 錯誤：sio_setpar() 失敗"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio 錯誤：sio_start() 失敗"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:33
 msgid "Song Change"
 msgstr "歌曲切換"
 
-#: src/song_change/song_change.cc:268
+#: src/songchange/song_change.cc:268
 msgid "<b>Commands</b>"
 msgstr "<b>命令</b>"
 
-#: src/song_change/song_change.cc:270
+#: src/songchange/song_change.cc:270
 msgid "Command to run when starting a new song:"
 msgstr "開始播放新歌曲時執行此命令："
 
-#: src/song_change/song_change.cc:273
+#: src/songchange/song_change.cc:273
 msgid "Command to run at the end of a song:"
 msgstr "當某首個播放完時執行此命令："
 
-#: src/song_change/song_change.cc:276
+#: src/songchange/song_change.cc:276
 msgid "Command to run at the end of the playlist:"
 msgstr "播放至播放清單的結尾時執行此命令："
 
-#: src/song_change/song_change.cc:279
+#: src/songchange/song_change.cc:279
 msgid "Command to run when song title changes (for network streams):"
 msgstr "當歌曲標題改變時執行此命令 (網路串流用)："
 
-#: src/song_change/song_change.cc:282
+#: src/songchange/song_change.cc:282
 msgid ""
 "You can use the following format codes, which will be replaced before "
 "running the command (not all are useful for the end-of-playlist command):"
@@ -3934,7 +4035,7 @@ msgstr ""
 "您可以使用以下的格式字串來表示特殊欄位(不是全部都能在播放清單結束命令中使"
 "用)："
 
-#: src/song_change/song_change.cc:285
+#: src/songchange/song_change.cc:285
 msgid ""
 "%a: Artist\n"
 "%b: Album\n"
@@ -3960,21 +4061,21 @@ msgstr ""
 "%t：播放清單的位置 (%02d)\n"
 "%T：音軌標題 (未格式化)"
 
-#: src/song_change/song_change.cc:296
+#: src/songchange/song_change.cc:296
 msgid ""
 "Parameters passed to the shell should be enclosed in quotation marks.  "
 "Unquoted parameters may lead to unexpected results."
 msgstr "傳給 shell 的參數應該用雙引號包起來，否則可能會導致非預期的結果。"
 
-#: src/song-info-qt/song-info.cc:34
+#: src/song-info-qt/song-info.cc:33
 msgid "Song Info"
 msgstr "歌曲資訊"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重取樣"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:145
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3988,43 +4089,43 @@ msgstr ""
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:151
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:152
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:154
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:155
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:159
 msgid "Quality:"
 msgstr "品質："
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "速度與音高"
 
-#: src/speed-pitch/speed-pitch.cc:210
+#: src/speedpitch/speed-pitch.cc:226
 msgid "<b>Speed and Pitch</b>"
 msgstr "<b>速度與音高</b>"
 
-#: src/speed-pitch/speed-pitch.cc:211
+#: src/speedpitch/speed-pitch.cc:227
 msgid "Speed:"
 msgstr "速度："
 
-#: src/speed-pitch/speed-pitch.cc:214
+#: src/speedpitch/speed-pitch.cc:230
 msgid "Pitch:"
 msgstr "音高："
 
-#: src/statusicon-qt/statusicon.cc:44 src/statusicon/statusicon.cc:48
+#: src/statusicon-qt/statusicon.cc:43 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "狀態圖示"
 
@@ -4126,12 +4227,12 @@ msgstr "<b>額外立體聲效果</b>"
 msgid "Tone Generator"
 msgstr "音調產生器"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音調產生器："
 
@@ -4153,7 +4254,7 @@ msgstr ""
 msgid "Voice Removal"
 msgstr "人聲移除"
 
-#: src/vorbis/vorbis.cc:408
+#: src/vorbis/vorbis.cc:406
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4230,7 +4331,7 @@ msgstr ""
 msgid "VTX Decoder"
 msgstr "VTX 解碼器"
 
-#: src/vtx/vtx.cc:186
+#: src/vtx/vtx.cc:176
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
@@ -4240,19 +4341,31 @@ msgstr ""
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
 #: src/wavpack/wavpack.cc:24
 msgid "WavPack Decoder"
 msgstr "WavPack 解碼器"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:211
 msgid "lossy (hybrid)"
 msgstr "失真 (混合)"
 
-#: src/wavpack/wavpack.cc:215
+#: src/wavpack/wavpack.cc:213
 msgid "lossy"
 msgstr "失真"
 
-#: src/wavpack/wavpack.cc:257
+#: src/wavpack/wavpack.cc:251
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4266,14 +4379,14 @@ msgstr ""
 msgid "2SF Decoder"
 msgstr "2SF 解碼器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:231
 msgid "<b>XSF Configuration</b>"
 msgstr "<b>XSF 組態</b>"
 
-#: src/xsf/plugin.cc:239
+#: src/xsf/plugin.cc:232
 msgid "Ignore length from file"
 msgstr "忽略來自檔案的長度資訊"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:90
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 可分享式播放清單 (XSPF)"
diff --git a/src/aac-raw/Makefile b/src/aac/Makefile
index c3c9ee2..64ed21a 100644
--- a/src/aac-raw/Makefile
+++ b/src/aac/Makefile
@@ -10,5 +10,5 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 LD = ${CXX}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${FAAD_CFLAGS} -I../..
-LIBS += ${FAAD_LIBS} -lm -laudtag
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../..
+LIBS += -lfaad -lm -laudtag
diff --git a/src/aac-raw/aac.cc b/src/aac/aac.cc
index 1a6d251..b7727e9 100644
--- a/src/aac-raw/aac.cc
+++ b/src/aac/aac.cc
@@ -19,13 +19,11 @@ public:
         PACKAGE
     };
 
-    static constexpr auto iinfo = InputInfo ()
-        .with_exts (exts);
-
-    constexpr AACDecoder () : InputPlugin (info, iinfo) {}
+    constexpr AACDecoder () : InputPlugin (info, InputInfo ()
+        .with_exts (exts)) {}
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 };
 
@@ -254,24 +252,24 @@ static void calc_aac_info (VFSFile & handle, int * length, int * bitrate,
         NeAACDecClose (decoder);
 }
 
-Tuple AACDecoder::read_tuple (const char * filename, VFSFile & handle)
+bool AACDecoder::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
-    Tuple tuple;
     int length, bitrate, samplerate, channels;
 
-    tuple.set_filename (filename);
     tuple.set_str (Tuple::Codec, "MPEG-2/4 AAC");
 
-    calc_aac_info (handle, &length, &bitrate, &samplerate, &channels);
+    // TODO: error handling
+    calc_aac_info (file, &length, &bitrate, &samplerate, &channels);
 
     if (length > 0)
         tuple.set_int (Tuple::Length, length);
     if (bitrate > 0)
         tuple.set_int (Tuple::Bitrate, bitrate);
 
-    tuple.fetch_stream_info (handle);
+    tuple.fetch_stream_info (file);
 
-    return tuple;
+    return true;
 }
 
 static void aac_seek (VFSFile & file, NeAACDecHandle dec, int time, int len,
@@ -330,15 +328,9 @@ bool AACDecoder::play (const char * filename, VFSFile & file)
     NeAACDecConfigurationPtr decoder_config;
     unsigned long samplerate = 0;
     unsigned char channels = 0;
-    int bitrate = 0;
 
     Tuple tuple = get_playback_tuple ();
-
-    if (tuple)
-    {
-        bitrate = tuple.get_int (Tuple::Bitrate);
-        bitrate = 1000 * aud::max (0, bitrate);
-    }
+    int bitrate = 1000 * aud::max (0, tuple.get_int (Tuple::Bitrate));
 
     if ((decoder = NeAACDecOpen ()) == nullptr)
     {
@@ -400,7 +392,7 @@ bool AACDecoder::play (const char * filename, VFSFile & file)
 
     /* == CHECK FOR METADATA == */
 
-    if (tuple && tuple.fetch_stream_info (file))
+    if (tuple.fetch_stream_info (file))
         set_playback_tuple (tuple.ref ());
 
     set_stream_bitrate (bitrate);
@@ -419,8 +411,7 @@ bool AACDecoder::play (const char * filename, VFSFile & file)
 
         if (seek_value >= 0)
         {
-            int length = tuple ? tuple.get_int (Tuple::Length) : 0;
-
+            int length = tuple.get_int (Tuple::Length);
             if (length > 0)
                 aac_seek (file, decoder, seek_value, length, buf, sizeof buf, & buflen);
         }
@@ -432,7 +423,7 @@ bool AACDecoder::play (const char * filename, VFSFile & file)
 
         /* == CHECK FOR METADATA == */
 
-        if (tuple && tuple.fetch_stream_info (file))
+        if (tuple.fetch_stream_info (file))
             set_playback_tuple (tuple.ref ());
 
         /* == DECODE A FRAME == */
diff --git a/src/adplug/Makefile b/src/adplug/Makefile
index 3239c1c..742c9e4 100644
--- a/src/adplug/Makefile
+++ b/src/adplug/Makefile
@@ -5,7 +5,6 @@ SRCS = adplug-xmms.cc		\
        binio/binio.cc		\
        binio/binstr.cc		\
        core/fmopl.cc		\
-       core/debug.cc		\
        core/adlibemu.cc		\
        core/adplug.cc		\
        core/emuopl.cc		\
@@ -64,5 +63,6 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 LD = ${CXX}
 CFLAGS += ${PLUGIN_CFLAGS}
+# FIXME: Turning off warnings for now; this code is awful
 CXXFLAGS += ${PLUGIN_CFLAGS} -Wno-sign-compare
 CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. -I./core -I./binio
diff --git a/src/adplug/adplug-xmms.cc b/src/adplug/adplug-xmms.cc
index 2cf0344..0a38719 100644
--- a/src/adplug/adplug-xmms.cc
+++ b/src/adplug/adplug-xmms.cc
@@ -43,16 +43,14 @@ public:
         PACKAGE
     };
 
-    static constexpr auto iinfo = InputInfo ()
-        .with_exts (exts);
-
-    constexpr AdPlugXMMS () : InputPlugin (info, iinfo) {}
+    constexpr AdPlugXMMS () : InputPlugin (info, InputInfo ()
+        .with_exts (exts)) {}
 
     bool init ();
     void cleanup ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 };
 
@@ -123,33 +121,31 @@ dbg_printf (const char *fmt, ...)
 
 /***** Main player (!! threaded !!) *****/
 
-Tuple AdPlugXMMS::read_tuple (const char * filename, VFSFile & fd)
+bool AdPlugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
-  Tuple tuple;
   CSilentopl tmpopl;
 
-  CFileProvider fp (fd);
+  CFileProvider fp (file);
   CPlayer *p = CAdPlug::factory (filename, &tmpopl, fp);
 
-  if (p)
-  {
-    tuple.set_filename (filename);
+  if (! p)
+    return false;
 
-    if (! p->getauthor().empty())
-      tuple.set_str (Tuple::Artist, p->getauthor().c_str());
+  if (! p->getauthor().empty())
+    tuple.set_str (Tuple::Artist, p->getauthor().c_str());
 
-    if (! p->gettitle().empty())
-      tuple.set_str (Tuple::Title, p->gettitle().c_str());
-    else if (! p->getdesc().empty())
-      tuple.set_str (Tuple::Title, p->getdesc().c_str());
+  if (! p->gettitle().empty())
+    tuple.set_str (Tuple::Title, p->gettitle().c_str());
+  else if (! p->getdesc().empty())
+    tuple.set_str (Tuple::Title, p->getdesc().c_str());
 
-    tuple.set_str (Tuple::Codec, p->gettype().c_str());
-    tuple.set_str (Tuple::Quality, _("sequenced"));
-    tuple.set_int (Tuple::Length, p->songlength (plr.subsong));
-    delete p;
-  }
+  tuple.set_str (Tuple::Codec, p->gettype().c_str());
+  tuple.set_str (Tuple::Quality, _("sequenced"));
+  tuple.set_int (Tuple::Length, p->songlength (plr.subsong));
+  delete p;
 
-  return tuple;
+  return true;
 }
 
 /* Main playback thread. Takes the filename to play as argument. */
diff --git a/src/adplug/core/a2m.cc b/src/adplug/core/a2m.cc
index 3ec924a..dd59a58 100644
--- a/src/adplug/core/a2m.cc
+++ b/src/adplug/core/a2m.cc
@@ -157,24 +157,24 @@ bool Ca2mLoader::load(const std::string &filename, const CFileProvider &fp)
     orgptr += sixdepak(secptr,orgptr,len[1]); secptr += len[1] / 2;
     if(version == 1) {
       if(numpats > 16)
-        orgptr += sixdepak(secptr,orgptr,len[2]); secptr += len[2] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[2]); secptr += len[2] / 2; }
       if(numpats > 32)
-        orgptr += sixdepak(secptr,orgptr,len[3]); secptr += len[3] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[3]); secptr += len[3] / 2; }
       if(numpats > 48)
         sixdepak(secptr,orgptr,len[4]);
     } else {
       if(numpats > 8)
-        orgptr += sixdepak(secptr,orgptr,len[2]); secptr += len[2] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[2]); secptr += len[2] / 2; }
       if(numpats > 16)
-        orgptr += sixdepak(secptr,orgptr,len[3]); secptr += len[3] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[3]); secptr += len[3] / 2; }
       if(numpats > 24)
-        orgptr += sixdepak(secptr,orgptr,len[4]); secptr += len[4] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[4]); secptr += len[4] / 2; }
       if(numpats > 32)
-        orgptr += sixdepak(secptr,orgptr,len[5]); secptr += len[5] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[5]); secptr += len[5] / 2; }
       if(numpats > 40)
-        orgptr += sixdepak(secptr,orgptr,len[6]); secptr += len[6] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[6]); secptr += len[6] / 2; }
       if(numpats > 48)
-        orgptr += sixdepak(secptr,orgptr,len[7]); secptr += len[7] / 2;
+        { orgptr += sixdepak(secptr,orgptr,len[7]); secptr += len[7] / 2; }
       if(numpats > 56)
         sixdepak(secptr,orgptr,len[8]);
     }
diff --git a/src/adplug/core/adl.cc b/src/adplug/core/adl.cc
index 18b3ae8..b27d1bf 100644
--- a/src/adplug/core/adl.cc
+++ b/src/adplug/core/adl.cc
@@ -741,7 +741,9 @@ void AdlibDriver::executePrograms() {
     }
 
     Channel &channel = _channels[_curChannel];
-    _curRegOffset = _regOffset[_curChannel];
+    if (_curChannel != 9) {
+      _curRegOffset = _regOffset[_curChannel];
+    }
 
     if (channel.tempoReset) {
       channel.tempo = _tempo;
diff --git a/src/adplug/core/adplug.cc b/src/adplug/core/adplug.cc
index 10a149b..a35cb10 100644
--- a/src/adplug/core/adplug.cc
+++ b/src/adplug/core/adplug.cc
@@ -182,9 +182,3 @@ std::string CAdPlug::get_version()
 {
   return std::string(VERSION);
 }
-
-void CAdPlug::debug_output(const std::string &filename)
-{
-  AdPlug_LogFile(filename.c_str());
-  AdPlug_LogWrite("CAdPlug::debug_output(\"%s\"): Redirected.\n",filename.c_str());
-}
diff --git a/src/adplug/core/adplug.h b/src/adplug/core/adplug.h
index 6b247bf..01b56d2 100644
--- a/src/adplug/core/adplug.h
+++ b/src/adplug/core/adplug.h
@@ -43,7 +43,6 @@ public:
 
   static void set_database(CAdPlugDatabase *db);
   static std::string get_version();
-  static void debug_output(const std::string &filename);
 
 private:
   static CAdPlugDatabase *database;
diff --git a/src/adplug/core/adtrack.cc b/src/adplug/core/adtrack.cc
index f8fc466..cc633c2 100644
--- a/src/adplug/core/adtrack.cc
+++ b/src/adplug/core/adtrack.cc
@@ -62,7 +62,7 @@ bool CadtrackLoader::load(const std::string &filename, const CFileProvider &fp)
   AdPlug_LogWrite("CadtrackLoader::load(,\"%s\"): Checking for \"%s\"...\n",
                   filename.c_str(), instfilename.c_str());
   instf = fp.open(instfilename);
-  if(!instf || fp.filesize(instf) != 468) { fp.close(f); return false; }
+  if(!instf || fp.filesize(instf) != 468) { if(instf) { fp.close(instf); } fp.close(f); return false; }
 
   // give CmodPlayer a hint on what we're up to
   realloc_patterns(1,1000,9); realloc_instruments(9); realloc_order(1);
diff --git a/src/adplug/core/bmf.cc b/src/adplug/core/bmf.cc
index 01aeada..b3601de 100644
--- a/src/adplug/core/bmf.cc
+++ b/src/adplug/core/bmf.cc
@@ -111,11 +111,13 @@ bool CxadbmfPlayer::xadplayer_load()
     ptr = 6;
 
     strncpy(bmf.title,(char *)&tune[ptr],36);
+    bmf.title[35] = 0;
 
     while (tune[ptr]) { ptr++; }
         ptr++;
 
     strncpy(bmf.author,(char *)&tune[ptr],36);
+    bmf.author[35] = 0;
 
     while (tune[ptr]) { ptr++; }
         ptr++;
diff --git a/src/adplug/core/debug.cc b/src/adplug/core/debug.cc
deleted file mode 100644
index 59d1f41..0000000
--- a/src/adplug/core/debug.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 Simon Peter <dn.tlp@gmx.net>, et al.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * debug.h - AdPlug Debug Logger
- * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
- * Copyright (c) 2002 Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifdef DEBUG
-
-#include <stdio.h>
-#include <stdarg.h>
-
-static FILE *log = NULL;
-
-void AdPlug_LogFile(const char *filename)
-{
-  if(log) fclose(log);
-  log = fopen(filename,"wt");
-}
-
-void AdPlug_LogWrite(const char *fmt, ...)
-{
-  va_list argptr;
-
-  va_start(argptr, fmt);
-
-  if(log) {
-    vfprintf(log, fmt, argptr);
-    fflush(log);
-  } else
-    vfprintf(stderr, fmt, argptr);
-
-  va_end(argptr);
-}
-
-#else
-
-void AdPlug_LogFile(const char *filename) { }
-void AdPlug_LogWrite(const char *fmt, ...) { }
-
-#endif
diff --git a/src/adplug/core/debug.h b/src/adplug/core/debug.h
index 2f03efa..c8a72a7 100644
--- a/src/adplug/core/debug.h
+++ b/src/adplug/core/debug.h
@@ -32,7 +32,8 @@
 #ifndef H_DEBUG
 #define H_DEBUG
 
-void AdPlug_LogFile(const char *filename);
-void AdPlug_LogWrite(const char *fmt, ...);
+#include <libaudcore/runtime.h>
+
+#define AdPlug_LogWrite(...) AUDDBG(__VA_ARGS__)
 
 #endif
diff --git a/src/adplug/core/dfm.cc b/src/adplug/core/dfm.cc
index d33f158..7a81f88 100644
--- a/src/adplug/core/dfm.cc
+++ b/src/adplug/core/dfm.cc
@@ -64,7 +64,8 @@ bool CdfmLoader::load(const std::string &filename, const CFileProvider &fp)
     inst[i].data[0] = f->readInt(1);
   }
   for(i = 0; i < 128; i++) order[i] = f->readInt(1);
-  for(i = 0; i < 128 && order[i] != 128; i++) continue; length = i;
+  for(i = 0; i < 128 && order[i] != 128; i++) continue;
+  length = i;
   npats = f->readInt(1);
   for(i = 0; i < npats; i++) {
     n = f->readInt(1);
diff --git a/src/adplug/core/hsp.cc b/src/adplug/core/hsp.cc
index a4f610c..dcbda94 100644
--- a/src/adplug/core/hsp.cc
+++ b/src/adplug/core/hsp.cc
@@ -51,8 +51,15 @@ bool ChspLoader::load(const std::string &filename, const CFileProvider &fp)
     if(j >= orgsize) break;     // memory boundary check
     memset(org + j, cmp[i + 1], j + cmp[i] < orgsize ? cmp[i] : orgsize - j - 1);
   }
+  if (j < orgsize) {
+    orgsize = j;
+  }
   delete [] cmp;
 
+  if (orgsize < 128 * 12 + 51) {        // check decompressed size
+    delete [] org;
+    return false;
+  }
   memcpy(instr, org, 128 * 12);         // instruments
   for(i = 0; i < 128; i++) {            // correct instruments
     instr[i][2] ^= (instr[i][2] & 0x40) << 1;
diff --git a/src/adplug/core/lds.cc b/src/adplug/core/lds.cc
index 7c87b28..1f89d23 100644
--- a/src/adplug/core/lds.cc
+++ b/src/adplug/core/lds.cc
@@ -273,7 +273,7 @@ bool CldsPlayer::update()
               case 0xf0:        // progch
                 // MIDI commands (unhandled)
                 AdPlug_LogWrite("CldsPlayer(): not handling MIDI command 0x%x, "
-                                "value = 0x%x\n", comhi);
+                                "value = 0x%x\n", comhi, comlo);
                 break;
               default:
                 if(comhi < 0xa0)
diff --git a/src/adplug/core/mid.cc b/src/adplug/core/mid.cc
index dc6c98d..9ff191f 100644
--- a/src/adplug/core/mid.cc
+++ b/src/adplug/core/mid.cc
@@ -871,7 +871,7 @@ void CmidPlayer::rewind(int subsong)
     for (i=0; i<128; i++)
         for (j=0; j<16; j++)
             myinsbank[i][j]=midi_fm_instruments[i][j];
-        for (i=0; i<16; i++)
+    for (i=0; i<16; i++)
         {
         ch[i].inum=0;
         for (j=0; j<11; j++)
diff --git a/src/adplug/core/protrack.cc b/src/adplug/core/protrack.cc
index 1b038ae..b652e1f 100644
--- a/src/adplug/core/protrack.cc
+++ b/src/adplug/core/protrack.cc
@@ -138,20 +138,23 @@ bool CmodPlayer::update()
       tone_portamento(chan,channel[chan].portainfo);
     else
       vibrato(chan,channel[chan].vibinfo1,channel[chan].vibinfo2);
-    case 10: if(del % 4)        // SA2 volume slide
-      break;
+    case 10:
+      if(del % 4)        // SA2 volume slide
+        break;
       if(info1)
         vol_up(chan,info1);
       else
         vol_down(chan,info2);
       setvolume(chan);
       break;
-    case 14: if(info1 == 3)     // retrig note
-      if(!(del % (info2+1)))
-        playnote(chan);
-      break;
-    case 16: if(del % 4)        // AMD volume slide
+    case 14:
+      if(info1 == 3)     // retrig note
+        if(!(del % (info2+1)))
+          playnote(chan);
       break;
+    case 16:
+      if(del % 4)        // AMD volume slide
+        break;
       if(info1)
         vol_up_alt(chan,info1);
       else
@@ -193,8 +196,8 @@ bool CmodPlayer::update()
   if(!resolve_order()) return !songend;
   pattnr = order[ord];
 
-  if(!rw) AdPlug_LogWrite("\nCmodPlayer::update(): Pattern: %d, Order: %d\n", pattnr, ord);
-  AdPlug_LogWrite("CmodPlayer::update():%3d|", rw);
+  if(!rw) AdPlug_LogWrite("\nCmodPlayer::update(): Pattern: %d, Order: %lu\n", pattnr, ord);
+  AdPlug_LogWrite("CmodPlayer::update():%3lu|", rw);
 
   // play row
   pattern_delay = 0;
diff --git a/src/adplug/core/s3m.cc b/src/adplug/core/s3m.cc
index 1f626e2..f4ea7c6 100644
--- a/src/adplug/core/s3m.cc
+++ b/src/adplug/core/s3m.cc
@@ -352,13 +352,15 @@ bool Cs3mPlayer::update()
         }
         break;
       case 7:                                                                                                           // tone portamento
-      case 8:   if((channel[realchan].fx == 7 ||        // vibrato (remember info for dual commands)
-                    channel[realchan].fx == 8) && pattern[pattnr][row][chan].info)
-        channel[realchan].dualinfo = info;
+      case 8:
+        if((channel[realchan].fx == 7 ||                // vibrato (remember info for dual commands)
+            channel[realchan].fx == 8) && pattern[pattnr][row][chan].info)
+          channel[realchan].dualinfo = info;
         break;
       case 10: channel[realchan].trigger = 0; break;    // arpeggio (set trigger)
-      case 19: if(info == 0xb0)                         // set loop start
-        loopstart = row;
+      case 19:
+        if(info == 0xb0)                                // set loop start
+          loopstart = row;
         if(info > 0xb0 && info <= 0xbf) {               // pattern loop
           if(!loopcnt) {
             loopcnt = info & 0x0f;
diff --git a/src/adplug/core/sa2.cc b/src/adplug/core/sa2.cc
index ee74f2b..d0f53c6 100644
--- a/src/adplug/core/sa2.cc
+++ b/src/adplug/core/sa2.cc
@@ -160,7 +160,7 @@ bool Csa2Loader::load(const std::string &filename, const CFileProvider &fp)
     activechan = f->readInt(2) << 16;           // active channels
 
   AdPlug_LogWrite("Csa2Loader::load(\"%s\"): sat_type = %x, nop = %d, "
-                  "length = %d, restartpos = %d, activechan = %x, bpm = %d\n",
+                  "length = %lu, restartpos = %lu, activechan = %lx, bpm = %d\n",
                   filename.c_str(), sat_type, nop, length, restartpos, activechan, bpm);
 
   // track data
diff --git a/src/adplug/core/sng.cc b/src/adplug/core/sng.cc
index 89dbb3f..e34d65e 100644
--- a/src/adplug/core/sng.cc
+++ b/src/adplug/core/sng.cc
@@ -73,7 +73,7 @@ bool CsngPlayer::update()
   if(!header.compressed)
     opl->write(data[pos].reg, data[pos].val);
 
-  if(data[pos].val) del = data[pos].val - 1; pos++;
+  if(data[pos].val) { del = data[pos].val - 1; pos++; }
   if(pos >= header.length) { songend = true; pos = header.loop; }
   return !songend;
 }
diff --git a/src/alarm/alarm.cc b/src/alarm/alarm.cc
index 2eadfca..8a08822 100644
--- a/src/alarm/alarm.cc
+++ b/src/alarm/alarm.cc
@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <math.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
@@ -56,7 +55,8 @@ public:
         N_("Alarm"),
         PACKAGE,
         about,
-        & prefs
+        & prefs,
+        PluginGLibOnly
     };
 
     constexpr AlarmPlugin () : GeneralPlugin (info, false) {}
@@ -149,7 +149,7 @@ static struct
     GtkEntry *cmdstr;
     GtkToggleButton *cmd_on;
 
-    GtkEntry *playlist;
+    GtkWidget *playlist;
 
     int default_hour;
     int default_min;
@@ -251,9 +251,8 @@ static void alarm_save()
     cmd_on = gtk_toggle_button_get_active (alarm_conf.cmd_on);
     aud_set_bool ("alarm", "cmd_on", cmd_on);
 
-    char * playlist = gtk_editable_get_chars ((GtkEditable *) alarm_conf.playlist, 0, -1);
-    aud_set_str ("alarm", "playlist", playlist);
-    g_free (playlist);
+    String playlist = audgui_file_entry_get_uri (alarm_conf.playlist);
+    aud_set_str ("alarm", "playlist", playlist ? playlist : "");
 
     /* reminder */
     char * reminder_msg = gtk_editable_get_chars ((GtkEditable *) alarm_conf.reminder, 0, -1);
@@ -418,8 +417,8 @@ static void *alarm_make_config_widget()
 
     String playlist = aud_get_str ("alarm", "playlist");
     w = lookup_widget(config_notebook, "playlist");
-    alarm_conf.playlist = GTK_ENTRY(w);
-    gtk_entry_set_text(alarm_conf.playlist, playlist);
+    alarm_conf.playlist = w;
+    audgui_file_entry_set_uri(alarm_conf.playlist, playlist);
 
     String reminder_msg = aud_get_str ("alarm", "reminder_msg");
     w = lookup_widget(config_notebook, "reminder_text");
diff --git a/src/alarm/interface.cc b/src/alarm/interface.cc
index 4b54ab5..1113b71 100644
--- a/src/alarm/interface.cc
+++ b/src/alarm/interface.cc
@@ -20,6 +20,7 @@
 #include <gtk/gtk.h>
 #include <libaudcore/i18n.h>
 #include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 #include "callbacks.h"
 
@@ -102,13 +103,6 @@ GtkWidget *create_reminder_dialog (const char *reminder_msg)
     return reminder_dialog;
 }
 
-static void file_set_cb (GtkFileChooserButton *button, void * entry)
-{
-    char *uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (button));
-    gtk_entry_set_text (GTK_ENTRY (entry), uri);
-    g_free (uri);
-}
-
 GtkWidget *create_config_notebook ()
 {
     /* General */
@@ -150,8 +144,8 @@ GtkWidget *create_config_notebook ()
     GtkWidget *fading_spin, *quiet_vol_scale, *vol_scale, *separator, *current_button;
 
     /* Page 4 */
-    GtkWidget  *cmd_entry, *playlist_entry, *reminder_text;
-    GtkWidget *cmd_checkb, *reminder_checkb, *file_chooser_button;
+    GtkWidget *cmd_entry, *playlist_entry, *reminder_text;
+    GtkWidget *cmd_checkb, *reminder_checkb;
 
     /* Page 5 */
     GtkWidget *view, *scrolled_window;
@@ -368,13 +362,10 @@ GtkWidget *create_config_notebook ()
     hbox = gtk_hbox_new (false, 6);
     gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
-    playlist_entry = gtk_entry_new ();
+    playlist_entry = audgui_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, _("Select a playlist"));
     g_object_set_data (G_OBJECT (notebook), "playlist", playlist_entry);
 
-    file_chooser_button = gtk_file_chooser_button_new (_("Select a playlist"), GTK_FILE_CHOOSER_ACTION_OPEN);
-    g_signal_connect (file_chooser_button, "file-set", G_CALLBACK (file_set_cb), playlist_entry);
     gtk_box_pack_start (GTK_BOX (hbox), playlist_entry, true, true, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), file_chooser_button, true, true, 0);
     gtk_container_add (GTK_CONTAINER (frame), hbox);
     gtk_box_pack_start (GTK_BOX (vbox), frame, false, false, 0);
 
diff --git a/src/albumart-qt/albumart.cc b/src/albumart-qt/albumart.cc
index df7720c..438a02a 100644
--- a/src/albumart-qt/albumart.cc
+++ b/src/albumart-qt/albumart.cc
@@ -20,7 +20,6 @@
 #include <QLabel>
 #include <QPixmap>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
@@ -32,7 +31,10 @@ class AlbumArtQt : public GeneralPlugin {
 public:
     static constexpr PluginInfo info = {
         N_("Album Art"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr AlbumArtQt () : GeneralPlugin (info, false) {}
diff --git a/src/albumart/albumart.cc b/src/albumart/albumart.cc
index 8711769..45fc0bb 100644
--- a/src/albumart/albumart.cc
+++ b/src/albumart/albumart.cc
@@ -17,7 +17,6 @@
  * the use of this software.
  */
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
@@ -30,7 +29,10 @@ class AlbumArtPlugin : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Album Art"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr AlbumArtPlugin () : GeneralPlugin (info, false) {}
diff --git a/src/alsa/alsa.cc b/src/alsa/alsa.cc
index 1d46f12..410f1ae 100644
--- a/src/alsa/alsa.cc
+++ b/src/alsa/alsa.cc
@@ -94,13 +94,13 @@ static bool poll_setup ()
 {
     if (pipe (poll_pipe))
     {
-        ERROR ("Failed to create pipe: %s.\n", strerror (errno));
+        AUDERR ("Failed to create pipe: %s.\n", strerror (errno));
         return false;
     }
 
     if (fcntl (poll_pipe[0], F_SETFL, O_NONBLOCK))
     {
-        ERROR ("Failed to set O_NONBLOCK on pipe: %s.\n", strerror (errno));
+        AUDERR ("Failed to set O_NONBLOCK on pipe: %s.\n", strerror (errno));
         close (poll_pipe[0]);
         close (poll_pipe[1]);
         return false;
@@ -120,7 +120,7 @@ static void poll_sleep ()
 {
     if (poll (poll_handles, poll_count, -1) < 0)
     {
-        ERROR ("Failed to poll: %s.\n", strerror (errno));
+        AUDERR ("Failed to poll: %s.\n", strerror (errno));
         return;
     }
 
@@ -136,7 +136,7 @@ static void poll_wake ()
 {
     const char c = 0;
     if (write (poll_pipe[1], & c, 1) < 0)
-        ERROR ("Failed to write to pipe: %s.\n", strerror (errno));
+        AUDERR ("Failed to write to pipe: %s.\n", strerror (errno));
 }
 
 static void poll_cleanup ()
@@ -307,7 +307,7 @@ static snd_pcm_format_t convert_aud_format (int aud_format)
     return SND_PCM_FORMAT_UNKNOWN;
 }
 
-bool ALSAPlugin::open_audio (int aud_format, int rate, int channels)
+bool ALSAPlugin::open_audio (int aud_format, int rate, int channels, String & error)
 {
     int total_buffer, hard_buffer, soft_buffer, buffer_frames;
     unsigned useconds;
@@ -319,19 +319,26 @@ bool ALSAPlugin::open_audio (int aud_format, int rate, int channels)
 
     String pcm = aud_get_str ("alsa", "pcm");
     snd_pcm_format_t format = convert_aud_format (aud_format);
+
+    if (format == SND_PCM_FORMAT_UNKNOWN)
+    {
+        error = String ("Unsupported audio format");
+        goto FAILED;
+    }
+
     AUDDBG ("Opening PCM device %s for %s, %d channels, %d Hz.\n",
      (const char *) pcm, snd_pcm_format_name (format), channels, rate);
-    CHECK_NOISY (snd_pcm_open, & alsa_handle, pcm, SND_PCM_STREAM_PLAYBACK, 0);
+    CHECK_STR (error, snd_pcm_open, & alsa_handle, pcm, SND_PCM_STREAM_PLAYBACK, 0);
 
     snd_pcm_hw_params_t * params;
     snd_pcm_hw_params_alloca (& params);
-    CHECK_NOISY (snd_pcm_hw_params_any, alsa_handle, params);
-    CHECK_NOISY (snd_pcm_hw_params_set_access, alsa_handle, params,
+    CHECK_STR (error, snd_pcm_hw_params_any, alsa_handle, params);
+    CHECK_STR (error, snd_pcm_hw_params_set_access, alsa_handle, params,
      SND_PCM_ACCESS_RW_INTERLEAVED);
 
-    CHECK_NOISY (snd_pcm_hw_params_set_format, alsa_handle, params, format);
-    CHECK_NOISY (snd_pcm_hw_params_set_channels, alsa_handle, params, channels);
-    CHECK_NOISY (snd_pcm_hw_params_set_rate, alsa_handle, params, rate, 0);
+    CHECK_STR (error, snd_pcm_hw_params_set_format, alsa_handle, params, format);
+    CHECK_STR (error, snd_pcm_hw_params_set_channels, alsa_handle, params, channels);
+    CHECK_STR (error, snd_pcm_hw_params_set_rate, alsa_handle, params, rate, 0);
 
     alsa_format = format;
     alsa_channels = channels;
@@ -340,17 +347,17 @@ bool ALSAPlugin::open_audio (int aud_format, int rate, int channels)
     total_buffer = aud_get_int (nullptr, "output_buffer_size");
     useconds = 1000 * aud::min (1000, total_buffer / 2);
     direction = 0;
-    CHECK_NOISY (snd_pcm_hw_params_set_buffer_time_near, alsa_handle, params,
-     & useconds, & direction);
+    CHECK_STR (error, snd_pcm_hw_params_set_buffer_time_near, alsa_handle,
+     params, & useconds, & direction);
     hard_buffer = useconds / 1000;
 
     useconds = 1000 * (hard_buffer / 4);
     direction = 0;
-    CHECK_NOISY (snd_pcm_hw_params_set_period_time_near, alsa_handle, params,
-     & useconds, & direction);
+    CHECK_STR (error, snd_pcm_hw_params_set_period_time_near, alsa_handle,
+     params, & useconds, & direction);
     alsa_period = useconds / 1000;
 
-    CHECK_NOISY (snd_pcm_hw_params, alsa_handle, params);
+    CHECK_STR (error, snd_pcm_hw_params, alsa_handle, params);
 
     soft_buffer = aud::max (total_buffer / 2, total_buffer - hard_buffer);
     AUDDBG ("Buffer: hardware %d ms, software %d ms, period %d ms.\n",
@@ -543,10 +550,10 @@ void ALSAPlugin::open_mixer ()
         goto FAILED;
 
     AUDDBG ("Opening mixer card %s.\n", (const char *) mixer);
-    CHECK_NOISY (snd_mixer_open, & alsa_mixer, 0);
-    CHECK_NOISY (snd_mixer_attach, alsa_mixer, mixer);
-    CHECK_NOISY (snd_mixer_selem_register, alsa_mixer, nullptr, nullptr);
-    CHECK_NOISY (snd_mixer_load, alsa_mixer);
+    CHECK (snd_mixer_open, & alsa_mixer, 0);
+    CHECK (snd_mixer_attach, alsa_mixer, mixer);
+    CHECK (snd_mixer_selem_register, alsa_mixer, nullptr, nullptr);
+    CHECK (snd_mixer_load, alsa_mixer);
 
     snd_mixer_selem_id_t * selem_id;
     snd_mixer_selem_id_alloca (& selem_id);
@@ -555,7 +562,7 @@ void ALSAPlugin::open_mixer ()
 
     if (! alsa_mixer_element)
     {
-        ERROR_NOISY ("snd_mixer_find_selem failed.\n");
+        AUDERR ("snd_mixer_find_selem failed.\n");
         goto FAILED;
     }
 
diff --git a/src/alsa/alsa.h b/src/alsa/alsa.h
index f59c24c..02b53bf 100644
--- a/src/alsa/alsa.h
+++ b/src/alsa/alsa.h
@@ -22,21 +22,14 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#define ERROR AUDERR
-
-#define ERROR_NOISY(...) do { \
-    aud_ui_show_error (str_printf ("ALSA error: " __VA_ARGS__)); \
-} while (0)
-
 #define CHECK_VAL(value, function, ...) \
 do { \
     (value) = function (__VA_ARGS__); \
     if ((value) < 0) { \
-        ERROR ("%s failed: %s.\n", #function, snd_strerror (value)); \
+        AUDERR ("%s failed: %s.\n", #function, snd_strerror (value)); \
         goto FAILED; \
     } \
 } while (0)
@@ -47,11 +40,12 @@ do { \
     CHECK_VAL (CHECK_error, function, __VA_ARGS__); \
 } while (0)
 
-#define CHECK_NOISY(function, ...) \
+#define CHECK_STR(str, function, ...) \
 do { \
-    int CHECK_NOISY_error = function (__VA_ARGS__); \
-    if (CHECK_NOISY_error < 0) { \
-        ERROR_NOISY ("%s failed: %s.\n", #function, snd_strerror (CHECK_NOISY_error)); \
+    int CHECK_STR_error = function (__VA_ARGS__); \
+    if (CHECK_STR_error < 0) { \
+        str = String (str_printf ("ALSA error: %s failed: %s.\n", #function, \
+         snd_strerror (CHECK_STR_error))); \
         goto FAILED; \
     } \
 } while (0)
@@ -81,7 +75,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume v);
 
-    bool open_audio (int aud_format, int rate, int chans);
+    bool open_audio (int aud_format, int rate, int chans, String & error);
     void close_audio ();
 
     void period_wait ();
diff --git a/src/alsa/config.cc b/src/alsa/config.cc
index ffe9576..3eaaf5c 100644
--- a/src/alsa/config.cc
+++ b/src/alsa/config.cc
@@ -235,7 +235,7 @@ static void guess_element ()
         }
     }
 
-    ERROR_NOISY ("No suitable mixer element found.\n");
+    AUDERR ("No suitable mixer element found.\n");
 }
 
 const char * const ALSAPlugin::defaults[] = {
diff --git a/src/amidi-plug/Makefile b/src/amidiplug/Makefile
index 6657a67..6657a67 100644
--- a/src/amidi-plug/Makefile
+++ b/src/amidiplug/Makefile
diff --git a/src/amidi-plug/amidi-plug.cc b/src/amidiplug/amidi-plug.cc
index edb6d54..c6de04a 100644
--- a/src/amidi-plug/amidi-plug.cc
+++ b/src/amidiplug/amidi-plug.cc
@@ -44,16 +44,14 @@ public:
         & amidiplug_prefs
     };
 
-    static constexpr auto iinfo = InputInfo ()
-        .with_exts (exts);
-
-    constexpr AMIDIPlug () : InputPlugin (info, iinfo) {}
+    constexpr AMIDIPlug () : InputPlugin (info, InputInfo ()
+        .with_exts (exts)) {}
 
     bool init ();
     void cleanup ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 
 #ifdef USE_GTK
@@ -140,19 +138,17 @@ bool AMIDIPlug::is_our_file (const char * filename, VFSFile & file)
     return false;
 }
 
-Tuple AMIDIPlug::read_tuple (const char * filename, VFSFile & file)
+bool AMIDIPlug::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
-    /* song title, get it from the filename */
-    Tuple tuple;
-    tuple.set_filename (filename);
-    tuple.set_str (Tuple::Codec, "MIDI");
-
     midifile_t mf;
+    if (! mf.parse_from_file (filename, file))
+        return false;
 
-    if (mf.parse_from_file (filename, file))
-        tuple.set_int (Tuple::Length, mf.length / 1000);
+    tuple.set_str (Tuple::Codec, "MIDI");
+    tuple.set_int (Tuple::Length, mf.length / 1000);
 
-    return tuple;
+    return true;
 }
 
 
diff --git a/src/amidi-plug/amidi-plug.midiicon.xpm b/src/amidiplug/amidi-plug.midiicon.xpm
index bff0e97..bff0e97 100644
--- a/src/amidi-plug/amidi-plug.midiicon.xpm
+++ b/src/amidiplug/amidi-plug.midiicon.xpm
diff --git a/src/amidi-plug/backend-fluidsynth/b-fluidsynth.cc b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
index 09d8c24..09d8c24 100644
--- a/src/amidi-plug/backend-fluidsynth/b-fluidsynth.cc
+++ b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
diff --git a/src/amidi-plug/i_backend.h b/src/amidiplug/i_backend.h
index d4f9ce3..d4f9ce3 100644
--- a/src/amidi-plug/i_backend.h
+++ b/src/amidiplug/i_backend.h
diff --git a/src/amidi-plug/i_configure-fluidsynth.cc b/src/amidiplug/i_configure-fluidsynth.cc
index 0e460e2..0e460e2 100644
--- a/src/amidi-plug/i_configure-fluidsynth.cc
+++ b/src/amidiplug/i_configure-fluidsynth.cc
diff --git a/src/amidi-plug/i_configure-fluidsynth.h b/src/amidiplug/i_configure-fluidsynth.h
index f6af4d8..f6af4d8 100644
--- a/src/amidi-plug/i_configure-fluidsynth.h
+++ b/src/amidiplug/i_configure-fluidsynth.h
diff --git a/src/amidi-plug/i_configure.cc b/src/amidiplug/i_configure.cc
index 6d551e5..6d551e5 100644
--- a/src/amidi-plug/i_configure.cc
+++ b/src/amidiplug/i_configure.cc
diff --git a/src/amidi-plug/i_configure.h b/src/amidiplug/i_configure.h
index 4648b1c..4648b1c 100644
--- a/src/amidi-plug/i_configure.h
+++ b/src/amidiplug/i_configure.h
diff --git a/src/amidi-plug/i_fileinfo.cc b/src/amidiplug/i_fileinfo.cc
index 1a2ee7e..1a2ee7e 100644
--- a/src/amidi-plug/i_fileinfo.cc
+++ b/src/amidiplug/i_fileinfo.cc
diff --git a/src/amidi-plug/i_fileinfo.h b/src/amidiplug/i_fileinfo.h
index 15749e5..15749e5 100644
--- a/src/amidi-plug/i_fileinfo.h
+++ b/src/amidiplug/i_fileinfo.h
diff --git a/src/amidi-plug/i_midi.cc b/src/amidiplug/i_midi.cc
index 7308712..7308712 100644
--- a/src/amidi-plug/i_midi.cc
+++ b/src/amidiplug/i_midi.cc
diff --git a/src/amidi-plug/i_midi.h b/src/amidiplug/i_midi.h
index 6863be6..6863be6 100644
--- a/src/amidi-plug/i_midi.h
+++ b/src/amidiplug/i_midi.h
diff --git a/src/amidi-plug/i_midievent.h b/src/amidiplug/i_midievent.h
index b939e5d..b939e5d 100644
--- a/src/amidi-plug/i_midievent.h
+++ b/src/amidiplug/i_midievent.h
diff --git a/src/ampache/Makefile b/src/ampache/Makefile
new file mode 100644
index 0000000..4d6dacf
--- /dev/null
+++ b/src/ampache/Makefile
@@ -0,0 +1,20 @@
+# Makefile
+#
+# Project: Ampache Browser Audacious Plugin
+# License: GNU GPLv3
+#
+# Copyright (C) 2015 - 2016 Róbert Čerňanský
+
+PLUGIN = ampache${PLUGIN_SUFFIX}
+
+SRCS = ampache.cc
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
+
+LD = ${CXX}
+CPPFLAGS += -I../.. -I. ${QT_CFLAGS} ${AMPACHE_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${QT_LIBS} ${AMPACHE_LIBS}
diff --git a/src/ampache/ampache.cc b/src/ampache/ampache.cc
new file mode 100644
index 0000000..a09f6b9
--- /dev/null
+++ b/src/ampache/ampache.cc
@@ -0,0 +1,134 @@
+// ampache.cc
+//
+// Project: Ampache Browser Audacious Plugin
+// License: GNU GPLv3
+//
+// Copyright (C) 2015-2016 Róbert Čerňanský and John Lindgren
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs_async.h>
+
+#include <ampache_browser/settings.h>
+#include <ampache_browser/ampache_browser.h>
+#include <ampache_browser/application_qt.h>
+
+#define CFG_SECT "ampache_browser"
+
+using NetworkCb = ampache_browser::ApplicationQt::NetworkRequestCb;
+using UrlList = std::vector<std::string>;
+
+class AmpacheBrowserPlugin: public GeneralPlugin
+{
+public:
+    static const char about[];
+
+    static constexpr PluginInfo pluginInfo = {
+        N_("Ampache Browser"),
+        PACKAGE,
+        about,
+        nullptr,
+        PluginQtOnly
+    };
+
+    constexpr AmpacheBrowserPlugin(): GeneralPlugin(pluginInfo, false) {}
+
+    bool init() override;
+    void cleanup() override;
+    void* get_qt_widget() override;
+};
+
+const char AmpacheBrowserPlugin::about[] =
+    N_("Ampache Browser\n\n"
+       "Ampache client for Audacious.\n\n"
+       "License: GNU GPLv3\n"
+       "Copyright (C) Róbert Čerňanský and John Lindgren\n");
+
+static SmartPtr<ampache_browser::ApplicationQt> s_app;
+
+static void vfsAsyncCb(const char* url, const Index<char>& data, void* callback)
+{
+    if (s_app) // ignore callbacks after cleanup()
+        (*(NetworkCb*)callback)(url, data.begin(), data.len());
+}
+
+static Index<PlaylistAddItem> toAddItems(const UrlList& urls)
+{
+    Index<PlaylistAddItem> addItems;
+    for (auto& url: urls)
+        addItems.append(String(url.c_str()));
+
+    return addItems;
+}
+
+static void initSettings(ampache_browser::Settings &settings)
+{
+    static const std::string bool_settings[] = {
+        settings.USE_DEMO_SERVER
+    };
+
+    static const std::string str_settings[] = {
+        settings.SERVER_URL,
+        settings.USER_NAME,
+        settings.PASSWORD_HASH
+    };
+
+    auto verbosity = getenv("AMPACHE_BROWSER_PLUGIN_VERBOSITY");
+    settings.setInt(settings.LOGGING_VERBOSITY, verbosity ? str_to_int(verbosity) : 0);
+
+    for (auto& name: bool_settings)
+        settings.setBool(name, aud_get_bool(CFG_SECT, name.c_str()));
+    for (auto& name: str_settings)
+        settings.setString(name, (const char*)aud_get_str(CFG_SECT, name.c_str()));
+
+    settings.connectChanged([&settings]() {
+        for (auto& name: bool_settings)
+            aud_set_bool(CFG_SECT, name.c_str(), settings.getBool(name));
+        for (auto& name: str_settings)
+            aud_set_str(CFG_SECT, name.c_str(), settings.getString(name).c_str());
+    });
+}
+
+bool AmpacheBrowserPlugin::init()
+{
+    s_app.capture(new ampache_browser::ApplicationQt);
+
+    s_app->setNetworkRequestFunction([](const std::string& url, NetworkCb& networkCb) {
+        vfs_async_file_get_contents(url.c_str(), vfsAsyncCb, &networkCb);
+    });
+
+    auto& browser = s_app->getAmpacheBrowser();
+
+    browser.connectPlay([](const UrlList& urls) {
+        aud_drct_pl_open_list(toAddItems(urls));
+    });
+
+    browser.connectCreatePlaylist([](const UrlList& urls) {
+        aud_playlist_entry_insert_batch(aud_playlist_new(), -1, toAddItems(urls), true);
+    });
+
+    browser.connectAddToPlaylist([](const UrlList& urls) {
+        aud_playlist_entry_insert_batch(aud_playlist_get_active(), -1, toAddItems(urls), false);
+    });
+
+    initSettings(s_app->getSettings());
+
+    return true;
+}
+
+void AmpacheBrowserPlugin::cleanup()
+{
+    s_app.clear();
+}
+
+void* AmpacheBrowserPlugin::get_qt_widget()
+{
+    s_app->run();
+    return s_app->getMainWidget();
+}
+
+EXPORT AmpacheBrowserPlugin aud_plugin_instance;
diff --git a/src/aosd/Makefile b/src/aosd/Makefile
index 3a02e65..9b148ea 100644
--- a/src/aosd/Makefile
+++ b/src/aosd/Makefile
@@ -17,5 +17,5 @@ plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 LD = ${CXX}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS} -lm
+CPPFLAGS += ${PLUGIN_CPPFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS} ${X11EXT_CFLAGS} -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${X11EXT_LIBS} -lm
diff --git a/src/aosd/aosd.h b/src/aosd/aosd.h
index 0d7cb8e..87814c7 100644
--- a/src/aosd/aosd.h
+++ b/src/aosd/aosd.h
@@ -21,7 +21,6 @@
 #ifndef _I_AOSD_H
 #define _I_AOSD_H 1
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/plugin.h>
 
 struct PreferencesWidget;
@@ -38,7 +37,8 @@ public:
         N_("AOSD (On-Screen Display)"),
         PACKAGE,
         about,
-        & prefs
+        & prefs,
+        PluginGLibOnly
     };
 
     constexpr AOSD () : GeneralPlugin (info, false) {}
diff --git a/src/aosd/aosd_osd.cc b/src/aosd/aosd_osd.cc
index d76c561..404a683 100644
--- a/src/aosd/aosd_osd.cc
+++ b/src/aosd/aosd_osd.cc
@@ -416,7 +416,6 @@ aosd_osd_init ( int transparency_mode )
     if ( transparency_mode == AOSD_MISC_TRANSPARENCY_FAKE )
       osd = ghosd_new();
     else
-#ifdef HAVE_XCOMPOSITE
     {
       /* check if the composite module is actually loaded */
       if ( aosd_osd_check_composite_ext() )
@@ -427,9 +426,6 @@ aosd_osd_init ( int transparency_mode )
         osd = ghosd_new(); /* fall back to fake transparency */
       }
     }
-#else
-      osd = ghosd_new();
-#endif
 
     if ( osd == nullptr )
       g_warning( "Unable to load osd object; OSD will not work properly!\n" );
@@ -450,7 +446,6 @@ aosd_osd_cleanup ( void )
   return;
 }
 
-#ifdef HAVE_XCOMPOSITE
 int
 aosd_osd_check_composite_ext ( void )
 {
@@ -506,4 +501,3 @@ aosd_osd_check_composite_mgr ( void )
     return have_comp_mgr;
   }
 }
-#endif
diff --git a/src/aosd/aosd_osd.h b/src/aosd/aosd_osd.h
index bd0cfdf..2d5ed6e 100644
--- a/src/aosd/aosd_osd.h
+++ b/src/aosd/aosd_osd.h
@@ -28,9 +28,7 @@ void aosd_osd_shutdown ( void );
 void aosd_osd_init ( int transparency_mode ); /* to be called before any OSD usage */
 void aosd_osd_cleanup ( void ); /* to be called when done with OSD usage */
 
-#ifdef HAVE_XCOMPOSITE
 int aosd_osd_check_composite_ext ( void );
 int aosd_osd_check_composite_mgr ( void );
-#endif
 
 #endif /* !_I_AOSD_OSD_H */
diff --git a/src/aosd/aosd_ui.cc b/src/aosd/aosd_ui.cc
index 3f3862e..23f6014 100644
--- a/src/aosd/aosd_ui.cc
+++ b/src/aosd/aosd_ui.cc
@@ -99,17 +99,16 @@ static void
 aosd_cb_configure_position_placement_commit ( GtkWidget * grid , aosd_cfg_t * cfg )
 {
   GList *placbt_list = gtk_container_get_children( GTK_CONTAINER(grid) );
-  GList *list_iter = placbt_list;
 
-  while ( list_iter != nullptr )
+  for ( GList *iter = placbt_list; iter != nullptr; iter = iter->next )
   {
-    GtkWidget *placbt = (GtkWidget *) list_iter->data;
+    GtkWidget *placbt = (GtkWidget *) iter->data;
+
     if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(placbt) ) == true )
     {
       cfg->position.placement = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(placbt),"value"));
       break;
     }
-    list_iter = g_list_next( list_iter );
   }
 
   g_list_free( placbt_list );
@@ -641,7 +640,6 @@ aosd_ui_configure_trigger ( aosd_cfg_t * cfg )
 }
 
 
-#ifdef HAVE_XCOMPOSITE
 static void
 aosd_cb_configure_misc_transp_real_clicked ( GtkToggleButton * real_rbt , void * status_hbox )
 {
@@ -671,22 +669,23 @@ aosd_cb_configure_misc_transp_real_clicked ( GtkToggleButton * real_rbt , void *
     gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , false );
   }
 }
-#endif
 
 
 static void
 aosd_cb_configure_misc_transp_commit ( GtkWidget * mis_transp_vbox , aosd_cfg_t * cfg )
 {
   GList *child_list = gtk_container_get_children( GTK_CONTAINER(mis_transp_vbox) );
-  while (child_list != nullptr)
+
+  for ( GList *iter = child_list; iter != nullptr; iter = iter->next )
   {
-    if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(child_list->data) ) )
+    if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(iter->data) ) )
     {
-      cfg->misc.transparency_mode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child_list->data),"val"));
+      cfg->misc.transparency_mode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iter->data), "val"));
       break;
     }
-    child_list = g_list_next(child_list);
   }
+
+  g_list_free( child_list );
 }
 
 
@@ -735,7 +734,6 @@ aosd_ui_configure_misc ( aosd_cfg_t * cfg )
   g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "img" , mis_transp_status_img );
   g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "label" , mis_transp_status_label );
 
-#ifdef HAVE_XCOMPOSITE
   g_signal_connect( G_OBJECT(mis_transp_real_rbt) , "toggled" ,
     G_CALLBACK(aosd_cb_configure_misc_transp_real_clicked) , mis_transp_status_hbox );
 
@@ -756,14 +754,6 @@ aosd_ui_configure_misc ( aosd_cfg_t * cfg )
     gtk_label_set_text( GTK_LABEL(mis_transp_status_label) , _("Composite extension not loaded") );
     gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_status_hbox) , false );
   }
-#else
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , true );
-  gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_real_rbt) , false );
-  gtk_image_set_from_icon_name( GTK_IMAGE(mis_transp_status_img) ,
-    "dialog-error" , GTK_ICON_SIZE_MENU );
-  gtk_label_set_text( GTK_LABEL(mis_transp_status_label) , _("Composite extension not available") );
-  gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_status_hbox) , false );
-#endif
 
   aosd_cb_list.append( mis_transp_vbox , aosd_cb_configure_misc_transp_commit );
 
diff --git a/src/aosd/ghosd.c b/src/aosd/ghosd.c
index cfe3886..67461cd 100644
--- a/src/aosd/ghosd.c
+++ b/src/aosd/ghosd.c
@@ -14,16 +14,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#ifdef HAVE_XCOMPOSITE
 #include <X11/extensions/Xcomposite.h>
-#endif
 
 #include <glib.h>
 
 #include "ghosd.h"
 #include "ghosd-internal.h"
 
-#ifdef HAVE_XCOMPOSITE
 static Bool
 composite_find_manager(Display *dpy, int scr)
 {
@@ -77,7 +74,6 @@ composite_find_argb_visual(Display *dpy, int scr)
 
   return visual;
 }
-#endif
 
 static Pixmap
 take_snapshot(Ghosd *ghosd) {
@@ -359,7 +355,6 @@ ghosd_new(void) {
   return ghosd;
 }
 
-#ifdef HAVE_XCOMPOSITE
 Ghosd *
 ghosd_new_with_argbvisual(void) {
   Ghosd *ghosd;
@@ -443,7 +438,6 @@ ghosd_check_composite_mgr(void)
   XCloseDisplay(dpy);
   return have_composite_m;
 }
-#endif
 
 void
 ghosd_destroy(Ghosd* ghosd) {
diff --git a/src/aosd/ghosd.h b/src/aosd/ghosd.h
index 70c36a7..a2dcea5 100644
--- a/src/aosd/ghosd.h
+++ b/src/aosd/ghosd.h
@@ -38,11 +38,9 @@ extern "C" {
 
 Ghosd *ghosd_new(void);
 void   ghosd_destroy(Ghosd* ghosd);
-#ifdef HAVE_XCOMPOSITE
 Ghosd *ghosd_new_with_argbvisual(void);
 int ghosd_check_composite_ext(void);
 int ghosd_check_composite_mgr(void);
-#endif
 
 #define GHOSD_COORD_CENTER INT_MAX
 void ghosd_set_transparent(Ghosd *ghosd, int transparent);
diff --git a/src/audpl/audpl.cc b/src/audpl/audpl.cc
index 0549a78..d75ff51 100644
--- a/src/audpl/audpl.cc
+++ b/src/audpl/audpl.cc
@@ -1,6 +1,6 @@
 /*
  * Audacious playlist format plugin
- * Copyright 2011 John Lindgren
+ * Copyright 2011-2016 John Lindgren
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -20,10 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
 #include <libaudcore/inifile.h>
+#include <libaudcore/plugin.h>
 
 static const char * const audpl_exts[] = {"audpl"};
 
@@ -65,7 +65,12 @@ private:
     Tuple tuple;
 
     void finish_item ()
-        { items.append (std::move (uri), std::move (tuple)); }
+    {
+        if (tuple.valid ())
+            tuple.set_filename (uri);
+
+        items.append (std::move (uri), std::move (tuple));
+    }
 
     /* no headings */
     void handle_heading (const char * heading) {}
@@ -83,21 +88,30 @@ private:
         }
         else if (uri)
         {
-            /* item field */
-            if (! tuple)
-                tuple.set_filename (uri);
-
-            if (strcmp (key, "empty"))
+            if (! strcmp (key, "state"))
             {
+                /* item state */
+                if (! strcmp (value, "good"))
+                    tuple.set_state (Tuple::Valid);
+                else if (! strcmp (value, "failed"))
+                    tuple.set_state (Tuple::Failed);
+            }
+            else
+            {
+                /* item field */
                 auto field = Tuple::field_by_name (key);
                 if (field == Tuple::Invalid)
                     return;
 
                 auto type = Tuple::field_get_type (field);
                 if (type == Tuple::String)
-                    tuple.set_str (field, str_decode_percent (value));
+                    tuple.set_str (field, (field == Tuple::AudioFile) ? value :
+                     str_decode_percent (value));
                 else if (type == Tuple::Int)
                     tuple.set_int (field, atoi (value));
+
+                /* state is implicitly Valid if any field is present */
+                tuple.set_state (Tuple::Valid);
             }
         }
         else
@@ -127,12 +141,15 @@ bool AudPlaylistLoader::save (const char * path, VFSFile & file,
         if (! inifile_write_entry (file, "uri", item.filename))
             return false;
 
-        const Tuple & tuple = item.tuple;
+        int keys = 0;
 
-        if (tuple)
+        switch (item.tuple.state ())
         {
-            int keys = 0;
+        case Tuple::Initial:
+            /* state is implicitly Initial if no fields are present */
+            break;
 
+        case Tuple::Valid:
             for (auto f : Tuple::all_fields ())
             {
                 if (f == Tuple::Path || f == Tuple::Basename ||
@@ -140,19 +157,20 @@ bool AudPlaylistLoader::save (const char * path, VFSFile & file,
                     continue;
 
                 const char * key = Tuple::field_get_name (f);
-                Tuple::ValueType type = tuple.get_value_type (f);
+                Tuple::ValueType type = item.tuple.get_value_type (f);
 
                 if (type == Tuple::String)
                 {
-                    String str = tuple.get_str (f);
-                    if (! inifile_write_entry (file, key, str_encode_percent (str)))
+                    String str = item.tuple.get_str (f);
+                    if (! inifile_write_entry (file, key,
+                     (f == Tuple::AudioFile) ? str : str_encode_percent (str)))
                         return false;
 
                     keys ++;
                 }
                 else if (type == Tuple::Int)
                 {
-                    int val = tuple.get_int (f);
+                    int val = item.tuple.get_int (f);
                     if (! inifile_write_entry (file, key, int_to_str (val)))
                         return false;
 
@@ -160,9 +178,17 @@ bool AudPlaylistLoader::save (const char * path, VFSFile & file,
                 }
             }
 
-            /* distinguish between an empty tuple and no tuple at all */
-            if (! keys && ! inifile_write_entry (file, "empty", "1"))
+            /* for an actual empty tuple, record state explicity */
+            if (! keys && ! inifile_write_entry (file, "state", "good"))
                 return false;
+
+            break;
+
+        case Tuple::Failed:
+            if (! inifile_write_entry (file, "state", "failed"))
+                return false;
+
+            break;
         }
     }
 
diff --git a/src/blur_scope/blur_scope.cc b/src/blur_scope/blur_scope.cc
index c5c08df..2b2c507 100644
--- a/src/blur_scope/blur_scope.cc
+++ b/src/blur_scope/blur_scope.cc
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/plugin.h>
@@ -56,7 +55,8 @@ public:
         N_("Blur Scope"),
         PACKAGE,
         nullptr,
-        & bscope_prefs
+        & bscope_prefs,
+        PluginGLibOnly
     };
 
     constexpr BlurScope () : VisPlugin (info, Visualizer::MonoPCM) {}
diff --git a/src/cairo-spectrum/cairo-spectrum.cc b/src/cairo-spectrum/cairo-spectrum.cc
index 8709402..045f27c 100644
--- a/src/cairo-spectrum/cairo-spectrum.cc
+++ b/src/cairo-spectrum/cairo-spectrum.cc
@@ -23,7 +23,6 @@
 
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
@@ -40,7 +39,10 @@ class CairoSpectrum : public VisPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Spectrum Analyzer"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr CairoSpectrum () : VisPlugin (info, Visualizer::Freq) {}
@@ -192,10 +194,7 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
     rgb_to_hsv (c->red / 65535.0, c->green / 65535.0, c->blue / 65535.0, & h, & s, & v);
 
     if (s < 0.1) /* monochrome theme? use blue instead */
-    {
-        h = 5;
-        s = 0.75;
-    }
+        h = 4.6;
 
     s = 1 - 0.9 * i / (bands - 1);
     v = 0.75 + 0.25 * i / (bands - 1);
diff --git a/src/cdaudio-ng/Makefile b/src/cdaudio/Makefile
index 59f125a..ba34c85 100644
--- a/src/cdaudio-ng/Makefile
+++ b/src/cdaudio/Makefile
@@ -10,5 +10,5 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 LD = ${CXX}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} -I../..
-LIBS += ${CDIO_LIBS} ${CDDB_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${CDIO_CFLAGS} -I../..
+LIBS += ${CDIO_LIBS}
diff --git a/src/cdaudio-ng/cdaudio-ng.cc b/src/cdaudio/cdaudio-ng.cc
index 643484c..188b72a 100644
--- a/src/cdaudio-ng/cdaudio-ng.cc
+++ b/src/cdaudio/cdaudio-ng.cc
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -46,6 +45,7 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
@@ -74,16 +74,14 @@ public:
         & prefs
     };
 
-    static constexpr auto iinfo = InputInfo (FlagSubtunes)
-        .with_schemes (cdaudio_schemes);
-
-    constexpr CDAudio () : InputPlugin (info, iinfo) {}
+    constexpr CDAudio () : InputPlugin (info, InputInfo (FlagSubtunes)
+        .with_schemes (cdaudio_schemes)) {}
 
     bool init ();
     void cleanup ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 };
 
@@ -108,9 +106,10 @@ static int lasttrackno = -1;
 static int n_audio_tracks;
 static cdrom_drive_t *pcdrom_drive = nullptr;
 static Index<trackinfo_t> trackinfo;
+static QueuedFunc purge_func;
 
 static bool scan_cd ();
-static void refresh_trackinfo (bool warning);
+static bool refresh_trackinfo (bool warning);
 static void reset_trackinfo ();
 static int calculate_track_length (int startlsn, int endlsn);
 static int find_trackno_from_filename (const char * filename);
@@ -191,7 +190,7 @@ static void purge_playlist (int playlist)
 }
 
 /* main thread only */
-static void purge_all_playlists ()
+static void purge_all_playlists (void * = nullptr)
 {
     int playlists = aud_playlist_count ();
     int count;
@@ -206,31 +205,10 @@ static void monitor (void *)
     pthread_mutex_lock (& mutex);
 
     /* make sure not to close drive handle while playing */
-    if (playing)
-    {
-        pthread_mutex_unlock (& mutex);
-        return;
-    }
-
-    if (trackinfo.len ())
+    if (! playing)
         refresh_trackinfo (false);
 
-    if (trackinfo.len ())
-    {
-        pthread_mutex_unlock (& mutex);
-        return;
-    }
-
-    timer_remove (TimerRate::Hz1, monitor);
     pthread_mutex_unlock (& mutex);
-
-    purge_all_playlists ();
-}
-
-/* mutex must be locked */
-static void trigger_monitor ()
-{
-    timer_add (TimerRate::Hz1, monitor);
 }
 
 /* main thread only */
@@ -260,15 +238,10 @@ bool CDAudio::play (const char * name, VFSFile & file)
 {
     pthread_mutex_lock (& mutex);
 
-    if (! trackinfo.len ())
+    if (! trackinfo.len () && ! refresh_trackinfo (true))
     {
-        refresh_trackinfo (true);
-
-        if (! trackinfo.len ())
-        {
-            pthread_mutex_unlock (& mutex);
-            return false;
-        }
+        pthread_mutex_unlock (& mutex);
+        return false;
     }
 
     bool okay = false;
@@ -371,16 +344,19 @@ void CDAudio::cleanup ()
     pthread_mutex_lock (& mutex);
 
     reset_trackinfo ();
+    purge_func.stop ();
+
     libcddb_shutdown ();
 
     pthread_mutex_unlock (& mutex);
 }
 
 /* thread safe */
-Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
+bool CDAudio::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
     bool whole_disk = ! strcmp (filename, "cdda://");
-    Tuple tuple;
+    bool valid = false;
 
     pthread_mutex_lock (& mutex);
 
@@ -388,16 +364,12 @@ Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
     if (whole_disk && ! playing)
         reset_trackinfo ();
 
-    if (! trackinfo.len ())
-        refresh_trackinfo (true);
-    if (! trackinfo.len ())
+    if (! trackinfo.len () && ! refresh_trackinfo (true))
         goto DONE;
 
     if (whole_disk)
     {
-        tuple.set_filename (filename);
-
-        Index<int> subtunes;
+        Index<short> subtunes;
 
         /* only add the audio tracks to the playlist */
         for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
@@ -405,6 +377,8 @@ Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
                 subtunes.append (trackno);
 
         tuple.set_subtunes (subtunes.len (), subtunes.begin ());
+
+        valid = true;
     }
     else
     {
@@ -422,7 +396,6 @@ Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
             goto DONE;
         }
 
-        tuple.set_filename (filename);
         tuple.set_format (_("Audio CD"), 2, 44100, 1411);
         tuple.set_int (Tuple::Track, trackno);
         tuple.set_int (Tuple::Length, calculate_track_length
@@ -438,19 +411,22 @@ Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
             tuple.set_str (Tuple::AlbumArtist, trackinfo[0].performer);
         if (trackinfo[trackno].genre)
             tuple.set_str (Tuple::Genre, trackinfo[trackno].genre);
+
+        valid = true;
     }
 
   DONE:
     pthread_mutex_unlock (& mutex);
-    return tuple;
+    return valid;
 }
 
 /* mutex must be locked */
-static void open_cd ()
+static bool open_cd ()
 {
-    AUDDBG ("Opening CD drive.\n");
-    assert (pcdrom_drive == nullptr);
+    if (pcdrom_drive)
+        return true;
 
+    AUDDBG ("Opening CD drive.\n");
     String device = aud_get_str ("CDDA", "device");
 
     if (device[0])
@@ -473,16 +449,40 @@ static void open_cd ()
         if (ppcd_drives)
             cdio_free_device_list (ppcd_drives);
     }
+
+    return (bool) pcdrom_drive;
+}
+
+/* mutex must be locked */
+static bool check_disc_mode (bool warning)
+{
+    int mode = cdio_get_discmode (pcdrom_drive->p_cdio);
+
+#ifdef _WIN32 /* cdio_get_discmode reports the wrong disk type sometimes */
+    if (mode == CDIO_DISC_MODE_NO_INFO || mode == CDIO_DISC_MODE_ERROR)
+#else
+    if (mode != CDIO_DISC_MODE_CD_DA && mode != CDIO_DISC_MODE_CD_MIXED)
+#endif
+    {
+        if (warning)
+        {
+            if (mode == CDIO_DISC_MODE_NO_INFO)
+                cdaudio_error (_("Drive is empty."));
+            else
+                cdaudio_error (_("Unsupported disk type."));
+        }
+
+        return false;
+    }
+
+    return true;
 }
 
 /* mutex must be locked */
 static bool scan_cd ()
 {
     AUDDBG ("Scanning CD drive.\n");
-    assert (pcdrom_drive);
-    assert (! trackinfo.len ());
-
-    int trackno;
+    trackinfo.clear ();
 
     /* general track initialization */
 
@@ -519,7 +519,7 @@ static bool scan_cd ()
 
     n_audio_tracks = 0;
 
-    for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+    for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
     {
         trackinfo[trackno].startlsn = cdda_track_firstsector (pcdrom_drive, trackno);
         trackinfo[trackno].endlsn = cdda_track_lastsector (pcdrom_drive, trackno);
@@ -567,7 +567,7 @@ static bool scan_cd ()
 
     /* get track information from cdtext */
     bool cdtext_was_available = false;
-    for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+    for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
     {
 #if LIBCDIO_VERSION_NUM < 90
         if (aud_get_bool ("CDDA", "use_cdtext"))
@@ -656,7 +656,7 @@ static bool scan_cd ()
                                           CDIO_CDROM_LEADOUT_TRACK);
                 cddb_disc_set_length (pcddb_disc, FRAMES_TO_SECONDS (lba));
 
-                for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+                for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
                 {
                     pcddb_track = cddb_track_new ();
                     cddb_track_set_frame_offset (pcddb_track,
@@ -742,43 +742,25 @@ static bool scan_cd ()
 }
 
 /* mutex must be locked */
-static void refresh_trackinfo (bool warning)
+static bool refresh_trackinfo (bool warning)
 {
-    if (pcdrom_drive == nullptr)
-    {
-        open_cd ();
-        if (pcdrom_drive == nullptr)
-            return;
-    }
+    if (! open_cd () || ! check_disc_mode (warning))
+        goto fail;
 
-    int mode = cdio_get_discmode (pcdrom_drive->p_cdio);
-#ifdef _WIN32 /* cdio_get_discmode reports the wrong disk type sometimes */
-    if (mode == CDIO_DISC_MODE_NO_INFO || mode == CDIO_DISC_MODE_ERROR)
-#else
-    if (mode != CDIO_DISC_MODE_CD_DA && mode != CDIO_DISC_MODE_CD_MIXED)
-#endif
+    if (! trackinfo.len () || cdio_get_media_changed (pcdrom_drive->p_cdio))
     {
-        if (warning)
-        {
-            if (mode == CDIO_DISC_MODE_NO_INFO)
-                cdaudio_error (_("Drive is empty."));
-            else
-                cdaudio_error (_("Unsupported disk type."));
-        }
+        if (! scan_cd ())
+            goto fail;
 
-        reset_trackinfo ();
-        return;
+        timer_add (TimerRate::Hz1, monitor);
     }
 
-    if (! trackinfo.len () || cdio_get_media_changed (pcdrom_drive->p_cdio))
-    {
-        trackinfo.clear ();
+    return true;
 
-        if (scan_cd ())
-            trigger_monitor ();
-        else
-            reset_trackinfo ();
-    }
+fail:
+    reset_trackinfo ();
+    purge_func.queue (purge_all_playlists, nullptr);
+    return false;
 }
 
 /* mutex must be locked */
diff --git a/src/console/Audacious_Driver.cc b/src/console/Audacious_Driver.cc
index 4d90bc7..2ed01a2 100644
--- a/src/console/Audacious_Driver.cc
+++ b/src/console/Audacious_Driver.cc
@@ -144,54 +144,56 @@ int ConsoleFileHandler::load(int sample_rate)
     return 0;
 }
 
-static Tuple get_track_ti(const char *path, const track_info_t *info, const int track)
+static int get_track_length(const track_info_t &info)
 {
-    Tuple tuple;
-    tuple.set_filename (path);
-
-    tuple.set_str (Tuple::Artist, info->author);
-    tuple.set_str (Tuple::Album, info->game);
-    tuple.set_str (Tuple::Title, info->song);
-    tuple.set_str (Tuple::Copyright, info->copyright);
-    tuple.set_str (Tuple::Codec, info->system);
-    tuple.set_str (Tuple::Comment, info->comment);
-
-    if (track >= 0)
-    {
-        tuple.set_int (Tuple::Track, track + 1);
-        tuple.set_int (Tuple::Subtune, track + 1);
-        tuple.set_int (Tuple::NumSubtunes, info->track_count);
-    }
-    else
-        tuple.set_subtunes (info->track_count, nullptr);
-
-    int length = info->length;
+    int length = info.length;
     if (length <= 0)
-        length = info->intro_length + 2 * info->loop_length;
+        length = info.intro_length + 2 * info.loop_length;
+
     if (length <= 0)
         length = audcfg.loop_length * 1000;
     else if (length >= fade_threshold)
         length += fade_length;
-    tuple.set_int (Tuple::Length, length);
 
-    return tuple;
+    return length;
 }
 
-Tuple ConsolePlugin::read_tuple(const char *filename, VFSFile &file)
+bool ConsolePlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
     ConsoleFileHandler fh(filename, file);
 
     if (!fh.m_type)
-        return Tuple ();
+        return false;
+
+    if (fh.load(gme_info_only))
+        return false;
 
-    if (!fh.load(gme_info_only))
+    track_info_t info;
+    if (log_err(fh.m_emu->track_info(&info, fh.m_track < 0 ? 0 : fh.m_track)))
+        return false;
+
+    auto set_str = [&tuple](Tuple::Field f, const char *s)
+        { if (s[0]) tuple.set_str(f, s); };
+
+    set_str(Tuple::Artist, info.author);
+    set_str(Tuple::Album, info.game);
+    set_str(Tuple::Title, info.song);
+    set_str(Tuple::Copyright, info.copyright);
+    set_str(Tuple::Codec, info.system);
+    set_str(Tuple::Comment, info.comment);
+
+    if (fh.m_track >= 0)
     {
-        track_info_t info;
-        if (!log_err(fh.m_emu->track_info(&info, fh.m_track < 0 ? 0 : fh.m_track)))
-            return get_track_ti(fh.m_path, &info, fh.m_track);
+        tuple.set_int(Tuple::Track, fh.m_track + 1);
+        tuple.set_int(Tuple::Subtune, fh.m_track + 1);
+        tuple.set_int(Tuple::NumSubtunes, info.track_count);
     }
+    else
+        tuple.set_subtunes(info.track_count, nullptr);
+
+    tuple.set_int (Tuple::Length, get_track_length (info));
 
-    return Tuple ();
+    return true;
 }
 
 bool ConsolePlugin::play(const char *filename, VFSFile &file)
@@ -246,12 +248,8 @@ bool ConsolePlugin::play(const char *filename, VFSFile &file)
         if (fh.m_type == gme_spc_type && audcfg.ignore_spc_length)
             info.length = -1;
 
-        Tuple tuple = get_track_ti(fh.m_path, &info, fh.m_track);
-        if (tuple)
-        {
-            length = tuple.get_int (Tuple::Length);
-            set_stream_bitrate(fh.m_emu->voice_count() * 1000);
-        }
+        length = get_track_length(info);
+        set_stream_bitrate(fh.m_emu->voice_count() * 1000);
     }
 
     // start track
diff --git a/src/console/plugin.h b/src/console/plugin.h
index 1c24eef..714b52f 100644
--- a/src/console/plugin.h
+++ b/src/console/plugin.h
@@ -29,10 +29,8 @@ public:
         & prefs
     };
 
-    static constexpr auto iinfo = InputInfo (FlagSubtunes)
-        .with_exts (exts);
-
-    constexpr ConsolePlugin () : InputPlugin (info, iinfo) {}
+    constexpr ConsolePlugin () : InputPlugin (info, InputInfo (FlagSubtunes)
+        .with_exts (exts)) {}
 
     bool init ();
     void cleanup ();
@@ -40,7 +38,7 @@ public:
     bool is_our_file (const char * filename, VFSFile & file)
         { return false; }
 
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 };
 
diff --git a/src/coreaudio/coreaudio.cc b/src/coreaudio/coreaudio.cc
index 6211db4..a98a2a0 100644
--- a/src/coreaudio/coreaudio.cc
+++ b/src/coreaudio/coreaudio.cc
@@ -61,7 +61,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume vol);
 
-    bool open_audio (int format, int rate_, int chan_);
+    bool open_audio (int format, int rate_, int chan_, String & err);
     void close_audio ();
 
     void period_wait ();
@@ -245,7 +245,8 @@ OSStatus CoreAudioPlugin::callback (void *inRefCon, AudioUnitRenderActionFlags *
     return 0;
 }
 
-bool CoreAudioPlugin::open_audio (int format, int rate_, int chan_)
+// TODO: return error message to core instead of calling aud_ui_show_error
+bool CoreAudioPlugin::open_audio (int format, int rate_, int chan_, String & err)
 {
     struct AudioUnitFormatDescriptionMap * m = nullptr;
 
diff --git a/src/cue/cue.cc b/src/cue/cue.cc
index aa9e389..d198d0b 100644
--- a/src/cue/cue.cc
+++ b/src/cue/cue.cc
@@ -18,10 +18,15 @@
  */
 
 #include <string.h>
+#include <pthread.h>
 
+#ifdef HAVE_LIBCUE2
+#include <libcue.h>
+#else
 extern "C" {
 #include <libcue/libcue.h>
 }
+#endif
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -45,15 +50,20 @@ EXPORT CueLoader aud_plugin_instance;
 bool CueLoader::load (const char * cue_filename, VFSFile & file, String & title,
  Index<PlaylistAddItem> & items)
 {
+    // XXX: cue_parse_string crashes if called concurrently
+    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
     Index<char> buffer = file.read_all ();
     if (! buffer.len ())
         return false;
 
     buffer.append (0);  /* null-terminate */
 
+    pthread_mutex_lock (& mutex);
     Cd * cd = cue_parse_string (buffer.begin ());
-    int tracks = cd ? cd_get_ntrack (cd) : 0;
+    pthread_mutex_unlock (& mutex);
 
+    int tracks = cd ? cd_get_ntrack (cd) : 0;
     if (tracks < 1)
         return false;
 
@@ -63,20 +73,22 @@ bool CueLoader::load (const char * cue_filename, VFSFile & file, String & title,
     if (! cur_name)
         return false;
 
-    bool new_file = true;
+    bool same_file = false;
     String filename;
     PluginHandle * decoder = nullptr;
     Tuple base_tuple;
 
     for (int track = 1; track <= tracks; track ++)
     {
-        if (new_file)
+        if (! same_file)
         {
             filename = String (uri_construct (cur_name, cue_filename));
-            decoder = filename ? aud_file_find_decoder (filename, false) : nullptr;
-            base_tuple = decoder ? aud_file_read_tuple (filename, decoder) : Tuple ();
+            decoder = nullptr;
+            base_tuple = Tuple ();
 
-            if (base_tuple)
+            VFSFile file;
+            if ((decoder = aud_file_find_decoder (filename, false, file)) &&
+             aud_file_read_tag (filename, decoder, file, base_tuple))
             {
                 Cdtext * cdtext = cd_get_cdtext (cd);
 
@@ -105,29 +117,30 @@ bool CueLoader::load (const char * cue_filename, VFSFile & file, String & title,
         Track * next = (track + 1 <= tracks) ? cd_get_track (cd, track + 1) : nullptr;
         const char * next_name = next ? track_get_filename (next) : nullptr;
 
-        new_file = (! next_name || strcmp (next_name, cur_name));
+        same_file = (next_name && ! strcmp (next_name, cur_name));
 
-        if (base_tuple)
+        if (base_tuple.valid ())
         {
-            StringBuf tfilename = str_printf ("%s?%d", (const char *) filename, track);
+            StringBuf tfilename = str_printf ("%s?%d", (const char *) cue_filename, track);
             Tuple tuple = base_tuple.ref ();
             tuple.set_filename (tfilename);
             tuple.set_int (Tuple::Track, track);
+            tuple.set_str (Tuple::AudioFile, filename);
 
             int begin = (int64_t) track_get_start (cur) * 1000 / 75;
             tuple.set_int (Tuple::StartTime, begin);
 
-            if (new_file)
+            if (same_file)
             {
-                int length = base_tuple.get_int (Tuple::Length);
-                if (length > 0)
-                    tuple.set_int (Tuple::Length, length - begin);
+                int end = (int64_t) track_get_start (next) * 1000 / 75;
+                tuple.set_int (Tuple::EndTime, end);
+                tuple.set_int (Tuple::Length, end - begin);
             }
             else
             {
-                int length = (int64_t) track_get_length (cur) * 1000 / 75;
-                tuple.set_int (Tuple::Length, length);
-                tuple.set_int (Tuple::EndTime, begin + length);
+                int length = base_tuple.get_int (Tuple::Length);
+                if (length > 0)
+                    tuple.set_int (Tuple::Length, length - begin);
             }
 
             Cdtext * cdtext = track_get_cdtext (cur);
diff --git a/src/delete-files/Makefile b/src/delete-files/Makefile
index 416a7ae..a019fea 100644
--- a/src/delete-files/Makefile
+++ b/src/delete-files/Makefile
@@ -9,6 +9,16 @@ plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 LD = ${CXX}
 
-CPPFLAGS += -I../.. ${GIO_CFLAGS} ${GTK_CFLAGS}
+CPPFLAGS += -I../.. ${GIO_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GIO_LIBS} ${GTK_LIBS} -laudgui
+LIBS += ${GIO_LIBS}
+
+ifeq ($(USE_GTK),yes)
+CPPFLAGS += ${GTK_CFLAGS}
+LIBS += ${GTK_LIBS} -laudgui
+endif
+
+ifeq ($(USE_QT),yes)
+CPPFLAGS += ${QT_CFLAGS}
+LIBS += ${QT_LIBS}
+endif
diff --git a/src/delete-files/delete-files.cc b/src/delete-files/delete-files.cc
index 7b9994e..d3d408c 100644
--- a/src/delete-files/delete-files.cc
+++ b/src/delete-files/delete-files.cc
@@ -24,9 +24,7 @@
 
 #include <gio/gio.h>
 #include <glib/gstdio.h>
-#include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
@@ -34,7 +32,14 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
+
+#ifdef USE_GTK
 #include <libaudgui/libaudgui-gtk.h>
+#endif
+#ifdef USE_QT
+#include <QMessageBox>
+#include <QPushButton>
+#endif
 
 class DeleteFiles : public GeneralPlugin
 {
@@ -64,7 +69,12 @@ static constexpr AudMenuID menus[] = {
     AudMenuID::PlaylistRemove
 };
 
+#ifdef USE_GTK
 static GtkWidget * dialog = nullptr;
+#endif
+#ifdef USE_QT
+static QMessageBox * qdialog = nullptr;
+#endif
 
 static void move_to_trash (const char * filename)
 {
@@ -121,34 +131,68 @@ static void confirm_delete ()
 
 static void start_delete ()
 {
-    if (dialog)
-    {
-        gtk_window_present ((GtkWindow *) dialog);
-        return;
-    }
-
-    const char * message;
-    GtkWidget * button1, * button2;
+    const char * message, * action, * icon;
 
     if (aud_get_bool ("delete_files", "use_trash"))
     {
         message = _("Do you want to move the selected files to the trash?");
-        button1 = audgui_button_new (_("Move to Trash"), "user-trash",
-         (AudguiCallback) confirm_delete, nullptr);
+        action = _("Move to Trash");
+        icon = "user-trash";
     }
     else
     {
         message = _("Do you want to permanently delete the selected files?");
-        button1 = audgui_button_new (_("Delete"), "edit-delete",
-         (AudguiCallback) confirm_delete, nullptr);
+        action = _("Delete");
+        icon = "edit-delete";
     }
 
-    button2 = audgui_button_new (_("Cancel"), "process-stop", nullptr, nullptr);
-    dialog = audgui_dialog_new (GTK_MESSAGE_QUESTION, _("Delete Files"),
-     message, button1, button2);
+#ifdef USE_GTK
+    if (aud_get_mainloop_type () == MainloopType::GLib)
+    {
+        if (dialog)
+        {
+            gtk_window_present ((GtkWindow *) dialog);
+            return;
+        }
+
+        auto button1 = audgui_button_new (action, icon, (AudguiCallback) confirm_delete, nullptr);
+        auto button2 = audgui_button_new (_("Cancel"), "process-stop", nullptr, nullptr);
+
+        dialog = audgui_dialog_new (GTK_MESSAGE_QUESTION, _("Delete Files"), message, button1, button2);
 
-    g_signal_connect (dialog, "destroy", (GCallback) gtk_widget_destroyed, & dialog);
-    gtk_widget_show_all (dialog);
+        g_signal_connect (dialog, "destroy", (GCallback) gtk_widget_destroyed, & dialog);
+        gtk_widget_show_all (dialog);
+    }
+#endif
+#ifdef USE_QT
+    if (aud_get_mainloop_type () == MainloopType::Qt)
+    {
+        if (qdialog)
+            return;
+
+        qdialog = new QMessageBox;
+        qdialog->setAttribute (Qt::WA_DeleteOnClose);
+        qdialog->setIcon (QMessageBox::Question);
+        qdialog->setWindowTitle (_("Delete Files"));
+        qdialog->setText (message);
+
+        auto remove = new QPushButton (action, qdialog);
+        auto cancel = new QPushButton (_("Cancel"), qdialog);
+
+        remove->setIcon (QIcon::fromTheme (icon));
+        cancel->setIcon (QIcon::fromTheme ("process-stop"));
+
+        qdialog->addButton (remove, QMessageBox::AcceptRole);
+        qdialog->addButton (cancel, QMessageBox::RejectRole);
+
+        QObject::connect (remove, & QPushButton::clicked, confirm_delete);
+        QObject::connect (qdialog, & QObject::destroyed, [] () {
+            qdialog = nullptr;
+        });
+
+        qdialog->show ();
+    }
+#endif
 }
 
 const char * const DeleteFiles::defaults[] = {
@@ -171,8 +215,13 @@ bool DeleteFiles::init ()
 
 void DeleteFiles::cleanup ()
 {
+#ifdef USE_GTK
     if (dialog)
         gtk_widget_destroy (dialog);
+#endif
+#ifdef USE_QT
+    delete qdialog;
+#endif
 
     for (AudMenuID menu : menus)
         aud_plugin_menu_remove (menu, start_delete);
diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
index ab954d9..3a56bf7 100644
--- a/src/ffaudio/ffaudio-core.cc
+++ b/src/ffaudio/ffaudio-core.cc
@@ -2,7 +2,7 @@
  * Audacious FFaudio Plugin
  * Copyright © 2009 William Pitcock <nenolod@dereferenced.org>
  *                  Matti Hämäläinen <ccr@tnsp.org>
- * Copyright © 2011 John Lindgren <john.lindgren@tds.net>
+ * Copyright © 2011-2016 John Lindgren <john.lindgren@aol.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -18,19 +18,27 @@
  * implied. In no event shall the authors be liable for any damages arising from
  */
 
-#include <pthread.h>
-
 #undef FFAUDIO_DOUBLECHECK  /* Doublecheck probing result for debugging purposes */
 #undef FFAUDIO_NO_BLACKLIST /* Don't blacklist any recognized codecs/formats */
 
 #include "ffaudio-stdinc.h"
 
+#include <pthread.h>
+
 #include <audacious/audtag.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/multihash.h>
 #include <libaudcore/runtime.h>
 
+#if CHECK_LIBAVFORMAT_VERSION (57, 33, 100, 57, 5, 0)
+#define ALLOC_CONTEXT 1
+#endif
+
+#if CHECK_LIBAVCODEC_VERSION (57, 37, 100, 57, 16, 0)
+#define SEND_PACKET 1
+#endif
+
 class FFaudio : public InputPlugin
 {
 public:
@@ -43,19 +51,16 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo (FlagWritesTag)
+    constexpr FFaudio () : InputPlugin (info, InputInfo (FlagWritesTag)
         .with_priority (10) /* lowest priority fallback */
         .with_exts (exts)
-        .with_mimes (mimes);
-
-    constexpr FFaudio () : InputPlugin (info, iinfo) {}
+        .with_mimes (mimes)) {}
 
     bool init ();
     void cleanup ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
-    Index<char> read_image (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
     bool play (const char * filename, VFSFile & file);
 };
@@ -66,11 +71,62 @@ typedef struct
 {
     int stream_idx;
     AVStream * stream;
-    AVCodecContext * context;
     AVCodec * codec;
 }
 CodecInfo;
 
+struct ScopedContext
+{
+    AVCodecContext * ptr;
+    AVCodecContext * operator-> () { return ptr; }
+
+    ScopedContext (const CodecInfo & cinfo)
+    {
+#ifdef ALLOC_CONTEXT
+        ptr = avcodec_alloc_context3 (cinfo.codec);
+        avcodec_parameters_to_context (ptr, cinfo.stream->codecpar);
+#else
+        ptr = cinfo.stream->codec;
+#endif
+    }
+
+#ifdef ALLOC_CONTEXT
+    ~ScopedContext () { avcodec_free_context (& ptr); }
+#else
+    ~ScopedContext () { avcodec_close (ptr); }
+#endif
+};
+
+struct ScopedPacket : public AVPacket
+{
+    ScopedPacket () { av_init_packet (this); }
+
+#if CHECK_LIBAVCODEC_VERSION (55, 25, 100, 55, 16, 0)
+    ~ScopedPacket () { av_packet_unref (this); }
+#else
+    ~ScopedPacket () { av_free_packet (this); }
+#endif
+};
+
+struct ScopedFrame
+{
+#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
+    AVFrame * ptr = av_frame_alloc ();
+#else
+    AVFrame * ptr = avcodec_alloc_frame ();
+#endif
+
+    AVFrame * operator-> () { return ptr; }
+
+#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
+    ~ScopedFrame () { av_frame_free (& ptr); }
+#elif CHECK_LIBAVCODEC_VERSION (54, 59, 100, 54, 28, 0)
+    ~ScopedFrame () { avcodec_free_frame (& ptr); }
+#else
+    ~ScopedFrame () { av_free (ptr); }
+#endif
+};
+
 static SimpleHash<String, AVInputFormat *> extension_dict;
 
 static void create_extension_dict ();
@@ -149,12 +205,22 @@ void FFaudio::cleanup ()
     av_lockmgr_register (nullptr);
 }
 
-static const char * ffaudio_strerror (int error)
+static int log_result (const char * func, int ret)
 {
-    static char buf[256];
-    return (! av_strerror (error, buf, sizeof buf)) ? buf : "unknown error";
+    if (ret < 0 && ret != (int) AVERROR_EOF && ret != AVERROR (EAGAIN))
+    {
+        static char buf[256];
+        if (! av_strerror (ret, buf, sizeof buf))
+            AUDERR ("%s failed: %s\n", func, buf);
+        else
+            AUDERR ("%s failed\n", func);
+    }
+
+    return ret;
 }
 
+#define LOG(function, ...) log_result (#function, function (__VA_ARGS__))
+
 static void create_extension_dict ()
 {
     AVInputFormat * f;
@@ -252,11 +318,8 @@ static AVFormatContext * open_input_file (const char * name, VFSFile & file)
     AVIOContext * io = io_context_new (file);
     c->pb = io;
 
-    int ret = avformat_open_input (& c, name, f, nullptr);
-
-    if (ret < 0)
+    if (LOG (avformat_open_input, & c, name, f, nullptr) < 0)
     {
-        AUDERR ("avformat_open_input failed for %s: %s.\n", name, ffaudio_strerror (ret));
         io_context_free (io);
         return nullptr;
     }
@@ -268,12 +331,7 @@ static void close_input_file (AVFormatContext * c)
 {
     AVIOContext * io = c->pb;
 
-#if CHECK_LIBAVFORMAT_VERSION (53, 25, 0, 53, 17, 0)
     avformat_close_input (&c);
-#else
-    av_close_input_file (c);
-#endif
-
     io_context_free (io);
 }
 
@@ -285,20 +343,23 @@ static bool find_codec (AVFormatContext * c, CodecInfo * cinfo)
     {
         AVStream * stream = c->streams[i];
 
-        if (stream && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+#ifndef ALLOC_CONTEXT
+#define codecpar codec
+#endif
+        if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
         {
-            AVCodec * codec = avcodec_find_decoder (stream->codec->codec_id);
+            AVCodec * codec = avcodec_find_decoder (stream->codecpar->codec_id);
 
             if (codec)
             {
                 cinfo->stream_idx = i;
                 cinfo->stream = stream;
-                cinfo->context = stream->codec;
                 cinfo->codec = codec;
 
                 return true;
             }
         }
+#undef codecpar
     }
 
     return false;
@@ -345,191 +406,182 @@ static void read_metadata_dict (Tuple & tuple, AVDictionary * dict)
     }
 }
 
-Tuple FFaudio::read_tuple (const char * filename, VFSFile & file)
+bool FFaudio::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image)
 {
-    Tuple tuple;
-    AVFormatContext * ic = open_input_file (filename, file);
+    SmartPtr<AVFormatContext, close_input_file>
+     ic (open_input_file (filename, file));
 
-    if (ic)
-    {
-        CodecInfo cinfo;
+    if (! ic)
+        return false;
 
-        if (find_codec (ic, & cinfo))
-        {
-            tuple.set_filename (filename);
+    CodecInfo cinfo;
+    if (! find_codec (ic.get (), & cinfo))
+        return false;
 
-            tuple.set_int (Tuple::Length, ic->duration / 1000);
-            tuple.set_int (Tuple::Bitrate, ic->bit_rate / 1000);
+    tuple.set_int (Tuple::Length, ic->duration / 1000);
+    tuple.set_int (Tuple::Bitrate, ic->bit_rate / 1000);
 
-            if (cinfo.codec->long_name)
-                tuple.set_str (Tuple::Codec, cinfo.codec->long_name);
+    if (cinfo.codec->long_name)
+        tuple.set_str (Tuple::Codec, cinfo.codec->long_name);
 
-            if (ic->metadata)
-                read_metadata_dict (tuple, ic->metadata);
-            if (cinfo.stream->metadata)
-                read_metadata_dict (tuple, cinfo.stream->metadata);
-        }
+    if (ic->metadata)
+        read_metadata_dict (tuple, ic->metadata);
+    if (cinfo.stream->metadata)
+        read_metadata_dict (tuple, cinfo.stream->metadata);
 
-        close_input_file (ic);
-    }
+    if (! file.fseek (0, VFS_SEEK_SET))
+        audtag::read_tag (file, tuple, image);
 
-    if (tuple && ! file.fseek (0, VFS_SEEK_SET))
-        audtag::read_tag (file, & tuple, nullptr);
+    if (image && (str_has_suffix_nocase (filename, ".m4a") ||
+                  str_has_suffix_nocase (filename, ".mp4")))
+    {
+        if (! file.fseek (0, VFS_SEEK_SET))
+            * image = read_itunes_cover (filename, file);
+    }
 
-    return tuple;
+    return true;
 }
 
 bool FFaudio::write_tuple (const char * filename, VFSFile & file, const Tuple & tuple)
 {
     if (str_has_suffix_nocase (filename, ".ape"))
-        return audtag::tuple_write (tuple, file, audtag::TagType::APE);
+        return audtag::write_tuple (file, tuple, audtag::TagType::APE);
 
-    return audtag::tuple_write (tuple, file, audtag::TagType::None);
+    return audtag::write_tuple (file, tuple, audtag::TagType::None);
 }
 
-Index<char> FFaudio::read_image (const char * filename, VFSFile & file)
+static bool convert_format (int ff_fmt, int & aud_fmt, bool & planar)
 {
-    if (str_has_suffix_nocase (filename, ".m4a") || str_has_suffix_nocase (filename, ".mp4"))
-        return read_itunes_cover (filename, file);
+    switch (ff_fmt)
+    {
+        case AV_SAMPLE_FMT_U8: aud_fmt = FMT_U8; planar = false; break;
+        case AV_SAMPLE_FMT_S16: aud_fmt = FMT_S16_NE; planar = false; break;
+        case AV_SAMPLE_FMT_S32: aud_fmt = FMT_S32_NE; planar = false; break;
+        case AV_SAMPLE_FMT_FLT: aud_fmt = FMT_FLOAT; planar = false; break;
 
-    return Index<char> ();
+        case AV_SAMPLE_FMT_U8P: aud_fmt = FMT_U8; planar = true; break;
+        case AV_SAMPLE_FMT_S16P: aud_fmt = FMT_S16_NE; planar = true; break;
+        case AV_SAMPLE_FMT_S32P: aud_fmt = FMT_S32_NE; planar = true; break;
+        case AV_SAMPLE_FMT_FLTP: aud_fmt = FMT_FLOAT; planar = true; break;
+
+    default:
+        AUDERR ("Unsupported audio format %d\n", (int) ff_fmt);
+        return false;
+    }
+
+    return true;
 }
 
 bool FFaudio::play (const char * filename, VFSFile & file)
 {
-    AUDDBG ("Playing %s.\n", filename);
+    SmartPtr<AVFormatContext, close_input_file>
+     ic (open_input_file (filename, file));
 
-    AVPacket pkt = AVPacket();
-    int errcount;
-    bool codec_opened = false;
-    int out_fmt;
-    bool planar;
-    bool error = false;
-
-    Index<char> buf;
-
-    AVFormatContext * ic = open_input_file (filename, file);
     if (! ic)
         return false;
 
     CodecInfo cinfo;
-
-    if (! find_codec (ic, & cinfo))
+    if (! find_codec (ic.get (), & cinfo))
     {
         AUDERR ("No codec found for %s.\n", filename);
-        goto error_exit;
+        return false;
     }
 
     AUDDBG("got codec %s for stream index %d, opening\n", cinfo.codec->name, cinfo.stream_idx);
 
-    if (avcodec_open2 (cinfo.context, cinfo.codec, nullptr) < 0)
-        goto error_exit;
-
-    codec_opened = true;
-
-    switch (cinfo.context->sample_fmt)
-    {
-        case AV_SAMPLE_FMT_U8: out_fmt = FMT_U8; planar = false; break;
-        case AV_SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; planar = false; break;
-        case AV_SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; planar = false; break;
-        case AV_SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; planar = false; break;
-
-        case AV_SAMPLE_FMT_U8P: out_fmt = FMT_U8; planar = true; break;
-        case AV_SAMPLE_FMT_S16P: out_fmt = FMT_S16_NE; planar = true; break;
-        case AV_SAMPLE_FMT_S32P: out_fmt = FMT_S32_NE; planar = true; break;
-        case AV_SAMPLE_FMT_FLTP: out_fmt = FMT_FLOAT; planar = true; break;
+    ScopedContext context (cinfo);
+    if (LOG (avcodec_open2, context.ptr, cinfo.codec, nullptr) < 0)
+        return false;
 
-    default:
-        AUDERR ("Unsupported audio format %d\n", (int) cinfo.context->sample_fmt);
-        goto error_exit;
-    }
+    int out_fmt; bool planar;
+    if (! convert_format (context->sample_fmt, out_fmt, planar))
+        return false;
 
     /* Open audio output */
-    AUDDBG("opening audio output\n");
-
     set_stream_bitrate(ic->bit_rate);
-    open_audio(out_fmt, cinfo.context->sample_rate, cinfo.context->channels);
+    open_audio(out_fmt, context->sample_rate, context->channels);
+
+    int errcount = 0;
+    bool eof = false;
 
-    errcount = 0;
+    Index<char> buf;
 
-    while (! check_stop ())
+    while (! eof && ! check_stop ())
     {
         int seek_value = check_seek ();
 
         if (seek_value >= 0)
         {
-            if (av_seek_frame (ic, -1, (int64_t) seek_value * AV_TIME_BASE /
-             1000, AVSEEK_FLAG_ANY) < 0)
-            {
-                AUDERR ("error while seeking\n");
-            } else
+            if (LOG (av_seek_frame, ic.get (), -1, (int64_t) seek_value *
+             AV_TIME_BASE / 1000, AVSEEK_FLAG_ANY) >= 0)
                 errcount = 0;
 
             seek_value = -1;
         }
 
-        AVPacket tmp;
-        int ret;
-
         /* Read next frame (or more) of data */
-        if ((ret = av_read_frame(ic, &pkt)) < 0)
+        ScopedPacket pkt;
+        int ret = LOG (av_read_frame, ic.get (), & pkt);
+
+        if (ret < 0)
         {
             if (ret == (int) AVERROR_EOF)
-            {
-                AUDDBG("eof reached\n");
-                break;
-            }
+                eof = true;
+            else if (++ errcount > 4)
+                return false;
             else
-            {
-                if (++errcount > 4)
-                {
-                    AUDERR ("av_read_frame error %d, giving up.\n", ret);
-                    break;
-                } else
-                    continue;
-            }
-        } else
+                continue;
+        }
+        else
+        {
             errcount = 0;
 
-        /* Ignore any other substreams */
-        if (pkt.stream_index != cinfo.stream_idx)
-        {
-            av_free_packet(&pkt);
-            continue;
+            /* Ignore any other substreams */
+            if (pkt.stream_index != cinfo.stream_idx)
+                continue;
         }
 
         /* Decode and play packet/frame */
-        memcpy(&tmp, &pkt, sizeof(tmp));
-        while (tmp.size > 0 && ! check_stop ())
-        {
-            /* Check for seek request and bail out if we have one */
-            if (seek_value < 0)
-                seek_value = check_seek ();
+        /* On EOF, send an empty packet to "flush" the decoder */
+        /* Otherwise, make a mutable (shallow) copy of the real packet */
+        AVPacket tmp;
+        if (eof)
+            av_init_packet (& tmp);
+        else
+            tmp = pkt;
 
-            if (seek_value >= 0)
-                break;
+#ifdef SEND_PACKET
+        if ((ret = LOG (avcodec_send_packet, context.ptr, & tmp)) < 0)
+            return false; /* defensive, errors not expected here */
+#endif
 
-#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
-            AVFrame * frame = av_frame_alloc ();
+        while (! check_stop ())
+        {
+            ScopedFrame frame;
+
+#ifdef SEND_PACKET
+            if ((ret = LOG (avcodec_receive_frame, context.ptr, frame.ptr)) < 0)
+                break; /* read next packet (continue past errors) */
 #else
-            AVFrame * frame = avcodec_alloc_frame ();
-#endif
             int decoded = 0;
-            int len = avcodec_decode_audio4 (cinfo.context, frame, & decoded, & tmp);
+            int len = LOG (avcodec_decode_audio4, context.ptr, frame.ptr, & decoded, & tmp);
 
             if (len < 0)
-            {
-                AUDERR ("decode_audio() failed, code %d\n", len);
-                break;
-            }
+                break; /* read next packet (continue past errors) */
 
             tmp.size -= len;
             tmp.data += len;
 
             if (! decoded)
-                continue;
+            {
+                if (tmp.size > 0)
+                    continue; /* process more of current packet */
 
-            int size = FMT_SIZEOF (out_fmt) * cinfo.context->channels * frame->nb_samples;
+                break; /* read next packet */
+            }
+#endif
+
+            int size = FMT_SIZEOF (out_fmt) * context->channels * frame->nb_samples;
 
             if (planar)
             {
@@ -537,34 +589,15 @@ bool FFaudio::play (const char * filename, VFSFile & file)
                     buf.resize (size);
 
                 audio_interlace ((const void * *) frame->data, out_fmt,
-                 cinfo.context->channels, buf.begin (), frame->nb_samples);
+                 context->channels, buf.begin (), frame->nb_samples);
                 write_audio (buf.begin (), size);
             }
             else
                 write_audio (frame->data[0], size);
-
-#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
-            av_frame_free (& frame);
-#elif CHECK_LIBAVCODEC_VERSION (54, 59, 100, 54, 28, 0)
-            avcodec_free_frame (& frame);
-#else
-            av_free (frame);
-#endif
         }
-
-        if (pkt.data)
-            av_free_packet(&pkt);
     }
 
-error_exit:
-    if (pkt.data)
-        av_free_packet(&pkt);
-    if (codec_opened)
-        avcodec_close(cinfo.context);
-    if (ic != nullptr)
-        close_input_file(ic);
-
-    return ! error;
+    return true;
 }
 
 const char FFaudio::about[] =
diff --git a/src/filewriter/Makefile b/src/filewriter/Makefile
index 347baba..04b08e4 100644
--- a/src/filewriter/Makefile
+++ b/src/filewriter/Makefile
@@ -15,5 +15,5 @@ plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 LD = ${CXX}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${FILEWRITER_CFLAGS} -I../..
-LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${FILEWRITER_CFLAGS} -I../..
+LIBS += ${GLIB_LIBS} ${FILEWRITER_LIBS}
diff --git a/src/filewriter/filewriter.cc b/src/filewriter/filewriter.cc
index 7853e04..9540d12 100644
--- a/src/filewriter/filewriter.cc
+++ b/src/filewriter/filewriter.cc
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <glib.h>
 #include <string.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -29,6 +29,10 @@
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
 
+#ifdef FILEWRITER_MP3
+#include <lame/lame.h>
+#endif
+
 #include "filewriter.h"
 #include "convert.h"
 
@@ -55,7 +59,7 @@ public:
     void set_volume (StereoVolume v) {}
 
     void set_info (const char * filename, const Tuple & tuple);
-    bool open_audio (int fmt, int rate, int nch);
+    bool open_audio (int fmt, int rate, int nch, String & error);
     void close_audio ();
 
     void period_wait () {}
@@ -84,11 +88,17 @@ static int save_original;
 /* stored as two separate booleans in the config file */
 static int filename_mode;
 
+#ifdef FILEWRITER_MP3
+/* stored as integers (0 or 1) in the config file */
+static bool mp3_enforce_iso, mp3_error_protect;
+static bool mp3_vbr_on, mp3_enforce_min, mp3_omit_xing;
+static bool mp3_frame_copyright, mp3_frame_original;
+static bool mp3_id3_force_v2, mp3_id3_only_v1, mp3_id3_only_v2;
+#endif
+
 static String in_filename;
 static Tuple in_tuple;
 
-static GtkWidget * path_dirbrowser;
-
 enum fileext_t
 {
     WAV = 0,
@@ -165,6 +175,22 @@ bool FileWriter::init ()
             p->init ();
     }
 
+#ifdef FILEWRITER_MP3
+    mp3_enforce_iso = aud_get_int ("filewriter_mp3", "enforce_iso_val");
+    mp3_error_protect = aud_get_int ("filewriter_mp3", "error_protect_val");
+
+    mp3_vbr_on = aud_get_int ("filewriter_mp3", "vbr_on");
+    mp3_enforce_min = aud_get_int ("filewriter_mp3", "enforce_min_val");
+    mp3_omit_xing = ! aud_get_int ("filewriter_mp3", "toggle_xing_val");
+
+    mp3_frame_copyright = aud_get_int ("filewriter_mp3", "mark_copyright_val");
+    mp3_frame_original = aud_get_int ("filewriter_mp3", "mark_original_val");
+
+    mp3_id3_force_v2 = aud_get_int ("filewriter_mp3", "force_v2_val");
+    mp3_id3_only_v1 = aud_get_int ("filewriter_mp3", "only_v1_val");
+    mp3_id3_only_v2 = aud_get_int ("filewriter_mp3", "only_v2_val");
+#endif
+
     return true;
 }
 
@@ -266,7 +292,7 @@ static StringBuf format_filename (const char * suffix)
     return filename;
 }
 
-bool FileWriter::open_audio (int fmt, int rate, int nch)
+bool FileWriter::open_audio (int fmt, int rate, int nch, String & error)
 {
     int ext = aud_get_int ("filewriter", "fileext");
     g_return_val_if_fail (ext >= 0 && ext < FILEEXT_MAX, false);
@@ -310,31 +336,9 @@ void FileWriter::close_audio ()
     in_tuple = Tuple ();
 }
 
-static void * create_dirbrowser ()
-{
-    path_dirbrowser = gtk_file_chooser_button_new (_("Pick a folder"),
-     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_file_chooser_set_uri ((GtkFileChooser *) path_dirbrowser, get_file_path ());
-    gtk_widget_set_sensitive (path_dirbrowser, ! save_original);
-
-    auto set_cb = [] ()
-    {
-        char * uri = gtk_file_chooser_get_uri ((GtkFileChooser *) path_dirbrowser);
-        aud_set_str ("filewriter", "file_path", uri);
-        g_free (uri);
-    };
-
-    // "file-set" is unreliable, so get the path on "destroy" as well
-    g_signal_connect (path_dirbrowser, "file-set", set_cb, nullptr);
-    g_signal_connect (path_dirbrowser, "destroy", set_cb, nullptr);
-
-    return path_dirbrowser;
-}
-
 static void save_original_cb ()
 {
     aud_set_bool ("filewriter", "save_original", save_original);
-    gtk_widget_set_sensitive (path_dirbrowser, ! save_original);
 }
 
 static void filename_mode_cb ()
@@ -381,7 +385,10 @@ static const PreferencesWidget main_widgets[] = {
     WidgetRadio (N_("Save into custom directory:"),
         WidgetInt (save_original, save_original_cb),
         {false}),
-    WidgetCustomGTK (create_dirbrowser),
+    WidgetFileEntry (nullptr,
+        WidgetString ("filewriter", "file_path"),
+        {FileSelectMode::Folder},
+        WIDGET_CHILD),
     WidgetSeparator ({true}),
     WidgetLabel (N_("Generate file name from:")),
     WidgetRadio (N_("Original file name"),
@@ -399,14 +406,159 @@ static const PreferencesWidget main_widgets[] = {
 };
 
 #ifdef FILEWRITER_MP3
+static const ComboItem mp3_sample_rates[] = {
+    ComboItem(N_("Auto"), 0),
+    ComboItem(N_("8000 Hz"), 8000),
+    ComboItem(N_("11025 Hz"), 11025),
+    ComboItem(N_("12000 Hz"), 12000),
+    ComboItem(N_("16000 Hz"), 16000),
+    ComboItem(N_("22050 Hz"), 22050),
+    ComboItem(N_("24000 Hz"), 24000),
+    ComboItem(N_("32000 Hz"), 32000),
+    ComboItem(N_("44100 Hz"), 44100),
+    ComboItem(N_("48000 Hz"), 48000)
+};
+
+static const ComboItem mp3_bitrates[] = {
+    ComboItem(N_("8 kbps"), 8),
+    ComboItem(N_("16 kbps"), 16),
+    ComboItem(N_("32 kbps"), 32),
+    ComboItem(N_("40 kbps"), 40),
+    ComboItem(N_("48 kbps"), 48),
+    ComboItem(N_("56 kbps"), 56),
+    ComboItem(N_("64 kbps"), 64),
+    ComboItem(N_("80 kbps"), 80),
+    ComboItem(N_("96 kbps"), 96),
+    ComboItem(N_("112 kbps"), 112),
+    ComboItem(N_("128 kbps"), 128),
+    ComboItem(N_("160 kbps"), 160),
+    ComboItem(N_("192 kbps"), 192),
+    ComboItem(N_("224 kbps"), 224),
+    ComboItem(N_("256 kbps"), 256),
+    ComboItem(N_("320 kbps"), 320)
+};
+
+static const ComboItem mp3_modes[] = {
+    ComboItem(N_("Auto"), NOT_SET),
+    ComboItem(N_("Joint Stereo"), JOINT_STEREO),
+    ComboItem(N_("Stereo"), STEREO),
+    ComboItem(N_("Mono"), MONO)
+};
+
+static const ComboItem mp3_vbr_modes[] = {
+    ComboItem(N_("VBR"), 0),
+    ComboItem(N_("ABR"), 1)
+};
+
+static void mp3_bools_changed ()
+{
+    aud_set_int ("filewriter_mp3", "enforce_iso_val", mp3_enforce_iso);
+    aud_set_int ("filewriter_mp3", "error_protect_val", mp3_error_protect);
+
+    aud_set_int ("filewriter_mp3", "vbr_on", mp3_vbr_on);
+    aud_set_int ("filewriter_mp3", "enforce_min_val", mp3_enforce_min);
+    aud_set_int ("filewriter_mp3", "toggle_xing_val", ! mp3_omit_xing);
+
+    aud_set_int ("filewriter_mp3", "mark_copyright_val", mp3_frame_copyright);
+    aud_set_int ("filewriter_mp3", "mark_original_val", mp3_frame_original);
+
+    aud_set_int ("filewriter_mp3", "force_v2_val", mp3_id3_force_v2);
+    aud_set_int ("filewriter_mp3", "only_v1_val", mp3_id3_only_v1);
+    aud_set_int ("filewriter_mp3", "only_v2_val", mp3_id3_only_v2);
+}
+
+static const PreferencesWidget mp3_quality_widgets[] = {
+    WidgetSpin(N_("Algorithm quality:"),
+        WidgetInt("filewriter_mp3", "algo_quality_val"),
+        {0, 9, 1}),
+    WidgetCombo(N_("Sample rate:"),
+        WidgetInt("filewriter_mp3", "out_samplerate_val"),
+        {{mp3_sample_rates}}),
+    WidgetRadio(N_("Bitrate:"),
+        WidgetInt("filewriter_mp3", "enc_toggle_val"),
+        {0}),
+    WidgetCombo(nullptr,
+        WidgetInt("filewriter_mp3", "bitrate_val"),
+        {{mp3_bitrates}},
+        WIDGET_CHILD),
+    WidgetRadio(N_("Compression ratio:"),
+        WidgetInt("filewriter_mp3", "enc_toggle_val"),
+        {1}),
+    WidgetSpin(nullptr,
+        WidgetFloat("filewriter_mp3", "compression_val"),
+        {0, 100, 1},
+        WIDGET_CHILD),
+    WidgetCombo(N_("Audio mode:"),
+        WidgetInt("filewriter_mp3", "audio_mode_val"),
+        {{mp3_modes}}),
+    WidgetCheck(N_("Enforce strict ISO compliance"),
+        WidgetBool(mp3_enforce_iso, mp3_bools_changed)),
+    WidgetCheck(N_("Error protection"),
+        WidgetBool(mp3_error_protect, mp3_bools_changed)),
+};
+
+static const PreferencesWidget mp3_vbr_abr_widgets[] = {
+    WidgetCheck(N_("Enable VBR/ABR"),
+        WidgetBool(mp3_vbr_on, mp3_bools_changed)),
+    WidgetCombo(N_("Type:"),
+        WidgetInt("filewriter_mp3", "vbr_type"),
+        {{mp3_vbr_modes}},
+        WIDGET_CHILD),
+    WidgetCombo(N_("Minimum bitrate:"),
+        WidgetInt("filewriter_mp3", "vbr_min_val"),
+        {{mp3_bitrates}},
+        WIDGET_CHILD),
+    WidgetCombo(N_("Maximum bitrate:"),
+        WidgetInt("filewriter_mp3", "vbr_max_val"),
+        {{mp3_bitrates}},
+        WIDGET_CHILD),
+    WidgetCombo(N_("Average bitrate:"),
+        WidgetInt("filewriter_mp3", "abr_val"),
+        {{mp3_bitrates}},
+        WIDGET_CHILD),
+    WidgetSpin(N_("VBR quality level:"),
+        WidgetInt("filewriter_mp3", "vbr_quality_val"),
+        {0, 9, 1},
+        WIDGET_CHILD),
+    WidgetCheck(N_("Strictly enforce minimum bitrate"),
+        WidgetBool(mp3_enforce_min, mp3_bools_changed),
+        WIDGET_CHILD),
+    WidgetCheck(N_("Omit Xing VBR header"),
+        WidgetBool(mp3_omit_xing, mp3_bools_changed),
+        WIDGET_CHILD)
+};
+
+static const PreferencesWidget mp3_tag_widgets[] = {
+    WidgetLabel(N_("<b>Frame Headers</b>")),
+    WidgetCheck(N_("Mark as copyright"),
+        WidgetBool(mp3_frame_copyright, mp3_bools_changed)),
+    WidgetCheck(N_("Mark as original"),
+        WidgetBool(mp3_frame_original, mp3_bools_changed)),
+    WidgetLabel(N_("<b>ID3 Tags</b>")),
+    WidgetCheck(N_("Force addition of version 2 tag"),
+        WidgetBool(mp3_id3_force_v2, mp3_bools_changed)),
+    WidgetCheck(N_("Only add v1 tag"),
+        WidgetBool(mp3_id3_only_v1, mp3_bools_changed)),
+    WidgetCheck(N_("Only add v2 tag"),
+        WidgetBool(mp3_id3_only_v2, mp3_bools_changed)),
+};
+
+static const NotebookTab mp3_tabs[] = {
+    {N_("Quality"), {mp3_quality_widgets}},
+    {N_("VBR/ABR"), {mp3_vbr_abr_widgets}},
+    {N_("Tags"), {mp3_tag_widgets}}
+};
+
 static const PreferencesWidget mp3_widgets[] = {
-    WidgetCustomGTK (mp3_configure)
+    WidgetNotebook ({{mp3_tabs}})
 };
 #endif
 
 #ifdef FILEWRITER_VORBIS
 static const PreferencesWidget vorbis_widgets[] = {
-    WidgetCustomGTK (vorbis_configure)
+    WidgetSpin(N_("Quality (0-1):"),
+        WidgetFloat("filewriter_vorbis", "base_quality"),
+        {0, 1, 0.01})
 };
 #endif
 
diff --git a/src/filewriter/filewriter.h b/src/filewriter/filewriter.h
index e3ff449..44b6acc 100644
--- a/src/filewriter/filewriter.h
+++ b/src/filewriter/filewriter.h
@@ -47,12 +47,10 @@ extern FileWriterImpl wav_plugin;
 
 #ifdef FILEWRITER_MP3
 extern FileWriterImpl mp3_plugin;
-void * mp3_configure ();
 #endif
 
 #ifdef FILEWRITER_VORBIS
 extern FileWriterImpl vorbis_plugin;
-void * vorbis_configure ();
 #endif
 
 #ifdef FILEWRITER_FLAC
diff --git a/src/filewriter/mp3.cc b/src/filewriter/mp3.cc
index 3c50153..f03a63c 100644
--- a/src/filewriter/mp3.cc
+++ b/src/filewriter/mp3.cc
@@ -26,73 +26,17 @@
 
 #ifdef FILEWRITER_MP3
 
-#include <string.h>
 #include <lame/lame.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 
-#define MODES 4
-static const int modes[MODES] = {NOT_SET, JOINT_STEREO, STEREO, MONO};
-static const char * const mode_names[MODES] = {N_("Auto"), N_("Joint Stereo"),
- N_("Stereo"), N_("Mono")};
-
-static GtkWidget *alg_quality_spin;
-static GtkWidget *alg_quality_hbox;
-static GtkAdjustment * alg_quality_adj;
-static GtkWidget *notebook;
-static GtkWidget *quality_vbox, *quality_hbox1, *alg_quality_frame;
-static GtkWidget *enc_quality_frame, *enc_quality_label1, *enc_quality_label2;
-static GtkWidget * enc_radio1, * enc_radio2;
-static GtkWidget *compression_spin;
-static GtkAdjustment * compression_adj;
-static GtkWidget * mode_hbox, * mode_frame;
-static GtkWidget * samplerate_hbox, * samplerate_label, * samplerate_frame;
-static GtkWidget *misc_frame, *misc_vbox, *enforce_iso_toggle,
-                 *error_protection_toggle;
-static GtkWidget *vbr_vbox, *vbr_toggle, *vbr_options_vbox, *vbr_type_frame,
-                 *vbr_type_hbox, *vbr_type_radio1, *vbr_type_radio2;
-static GtkWidget * abr_frame, * abr_hbox, * abr_label;
-static GtkWidget *vbr_frame, *vbr_options_vbox2;
-static GtkWidget * vbr_options_hbox1, * vbr_min_label;
-static GtkWidget * vbr_options_hbox2, * vbr_max_label, * enforce_min_toggle;
-static GtkWidget *vbr_options_hbox3, *vbr_quality_spin, *vbr_quality_label;
-static GtkAdjustment * vbr_quality_adj;
-static GtkWidget *xing_header_toggle;
-static GtkWidget *tags_vbox, *tags_frames_frame, *tags_frames_hbox,
-                 *tags_copyright_toggle, *tags_original_toggle;
-static GtkWidget *tags_id3_frame, *tags_id3_vbox, *tags_id3_hbox,
-                 *tags_force_id3v2_toggle, *tags_only_v1_toggle, *tags_only_v2_toggle;
-
-static GtkWidget *enc_quality_vbox, *hbox1, *hbox2;
-
-static unsigned long numsamples = 0;
-static int inside;
-
-static int available_samplerates[] =
-{ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 } ;
-
-static int available_bitrates[] =
-{ 8, 16, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320 } ;
-
-struct lameid3_t {
-    String track_name;
-    String album_name;
-    String performer;
-    String genre;
-    String year;
-    String track_number;
-};
-
-static lameid3_t lameid3;
-
 static lame_global_flags *gfp;
 static unsigned char encbuffer[LAME_MAXMP3BUFFER];
 static int id3v2_size;
 
 static int channels;
+static unsigned long numsamples;
 static Index<unsigned char> write_buffer;
 
 static void lame_debugf(const char *format, va_list ap)
@@ -125,9 +69,7 @@ static const char * const mp3_defaults[] = {
  nullptr};
 
 #define GET_INT(n)       aud_get_int("filewriter_mp3", n)
-#define SET_INT(n, v)    aud_set_int("filewriter_mp3", n, v)
 #define GET_DOUBLE(n)    aud_get_double("filewriter_mp3", n)
-#define SET_DOUBLE(n, v) aud_set_double("filewriter_mp3", n, v)
 
 static void mp3_init ()
 {
@@ -146,23 +88,12 @@ static bool mp3_open (VFSFile & file, const format_info & info, const Tuple & tu
     id3tag_init(gfp);
 
     /* XXX write UTF-8 even though libmp3lame does id3v2.3. --yaz */
-    lameid3.track_name = tuple.get_str (Tuple::Title);
-    id3tag_set_title(gfp, lameid3.track_name);
-
-    lameid3.performer = tuple.get_str (Tuple::Artist);
-    id3tag_set_artist(gfp, lameid3.performer);
-
-    lameid3.album_name = tuple.get_str (Tuple::Album);
-    id3tag_set_album(gfp, lameid3.album_name);
-
-    lameid3.genre = tuple.get_str (Tuple::Genre);
-    id3tag_set_genre(gfp, lameid3.genre);
-
-    lameid3.year = String (int_to_str (tuple.get_int (Tuple::Year)));
-    id3tag_set_year(gfp, lameid3.year);
-
-    lameid3.track_number = String (int_to_str (tuple.get_int (Tuple::Track)));
-    id3tag_set_track(gfp, lameid3.track_number);
+    id3tag_set_title(gfp, tuple.get_str (Tuple::Title));
+    id3tag_set_artist(gfp, tuple.get_str (Tuple::Artist));
+    id3tag_set_album(gfp, tuple.get_str (Tuple::Album));
+    id3tag_set_genre(gfp, tuple.get_str (Tuple::Genre));
+    id3tag_set_year(gfp, int_to_str (tuple.get_int (Tuple::Year)));
+    id3tag_set_track(gfp, int_to_str (tuple.get_int (Tuple::Track)));
 
     if (GET_INT("force_v2_val"))
         id3tag_add_v2(gfp);
@@ -193,10 +124,12 @@ static bool mp3_open (VFSFile & file, const format_info & info, const Tuple & tu
     lame_set_msgf(gfp, lame_debugf);
 
     const int vbr_on = GET_INT("vbr_on");
-    if (GET_INT("enc_toggle_val") == 0 && vbr_on == 0)
-        lame_set_brate(gfp, GET_INT("bitrate_val"));
-    else if (vbr_on == 0)
-        lame_set_compression_ratio(gfp, GET_DOUBLE("compression_val"));
+    if (vbr_on == 0) {
+        if (GET_INT("enc_toggle_val") == 0)
+            lame_set_brate(gfp, GET_INT("bitrate_val"));
+        else
+            lame_set_compression_ratio(gfp, GET_DOUBLE("compression_val"));
+    }
 
     /* frame params */
 
@@ -240,6 +173,7 @@ static bool mp3_open (VFSFile & file, const format_info & info, const Tuple & tu
     }
 
     channels = info.channels;
+    numsamples = 0;
     return true;
 }
 
@@ -314,717 +248,6 @@ static void mp3_close (VFSFile & file)
 
     lame_close(gfp);
     AUDDBG("lame_close() done\n");
-
-    lameid3 = lameid3_t ();
-    numsamples = 0;
-}
-
-/*****************/
-/* Configuration */
-/*****************/
-
-/* Various Signal-Fuctions */
-
-static void algo_qual(GtkAdjustment * adjustment, void * user_data)
-{
-    SET_INT("algo_quality_val",
-        gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(alg_quality_spin)));
-
-}
-
-static void samplerate_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo) - 1;
-
-    if (i >= 0 && i < aud::n_elems (available_samplerates))
-        SET_INT("out_samplerate_val", available_samplerates[i]);
-    else
-        SET_INT("out_samplerate_val", 0);
-}
-
-static void bitrate_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo);
-
-    if (i >= 0 && i < aud::n_elems (available_bitrates))
-        SET_INT("bitrate_val", available_bitrates[i]);
-    else
-        SET_INT("bitrate_val", 128);
-}
-
-static void compression_change(GtkAdjustment * adjustment,
-                               void * user_data)
-{
-    SET_DOUBLE("compression_val",
-        gtk_spin_button_get_value(GTK_SPIN_BUTTON(compression_spin)));
-}
-
-static void encoding_toggle(GtkToggleButton * togglebutton,
-                            void * user_data)
-{
-    SET_INT("enc_toggle_val", GPOINTER_TO_INT(user_data));
-}
-
-static void mode_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo);
-
-    if (i >= 0 && i < MODES)
-        SET_INT("audio_mode_val", modes[i]);
-    else
-        SET_INT("audio_mode_val", NOT_SET);
-}
-
-static void toggle_enforce_iso(GtkToggleButton * togglebutton,
-                               void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(enforce_iso_toggle)))
-        SET_INT("enforce_iso_val", 1);
-    else
-        SET_INT("enforce_iso_val", 0);
-}
-
-static void toggle_error_protect(GtkToggleButton * togglebutton,
-                                 void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(error_protection_toggle)))
-        SET_INT("error_protect_val", 1);
-    else
-        SET_INT("error_protect_val", 0);
-}
-
-static void toggle_vbr(GtkToggleButton * togglebutton, void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vbr_toggle)) ==
-        true) {
-        gtk_widget_set_sensitive(vbr_options_vbox, true);
-        gtk_widget_set_sensitive(enc_quality_frame, false);
-        SET_INT("vbr_on", 1);
-
-        if (GET_INT("vbr_type") == 0) {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (vbr_type_radio1), true);
-            gtk_widget_set_sensitive(abr_frame, false);
-            gtk_widget_set_sensitive(vbr_frame, true);
-        }
-        else {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (vbr_type_radio2), true);
-            gtk_widget_set_sensitive(abr_frame, true);
-            gtk_widget_set_sensitive(vbr_frame, false);
-        }
-
-    }
-    else {
-        gtk_widget_set_sensitive(vbr_options_vbox, false);
-        gtk_widget_set_sensitive(enc_quality_frame, true);
-        SET_INT("vbr_on", 0);
-    }
-}
-
-static void vbr_abr_toggle(GtkToggleButton * togglebutton,
-                           void * user_data)
-{
-    if (!strcmp((char *) user_data, "VBR")) {
-        gtk_widget_set_sensitive(abr_frame, false);
-        gtk_widget_set_sensitive(vbr_frame, true);
-        SET_INT("vbr_type", 0);
-    }
-    else if (!strcmp((char *) user_data, "ABR")) {
-        gtk_widget_set_sensitive(abr_frame, true);
-        gtk_widget_set_sensitive(vbr_frame, false);
-        SET_INT("vbr_type", 1);
-    }
-}
-
-static void vbr_min_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo);
-
-    if (i >= 0 && i < aud::n_elems (available_bitrates))
-        SET_INT("vbr_min_val", available_bitrates[i]);
-    else
-        SET_INT("vbr_min_val", 32);
-}
-
-static void vbr_max_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo);
-
-    if (i >= 0 && i < aud::n_elems (available_bitrates))
-        SET_INT("vbr_max_val", available_bitrates[i]);
-    else
-        SET_INT("vbr_max_val", 320);
-}
-
-static void toggle_enforce_min(GtkToggleButton * togglebutton,
-                               void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(enforce_min_toggle)))
-        SET_INT("enforce_min_val", 1);
-    else
-        SET_INT("enforce_min_val", 0);
-}
-
-static void vbr_qual(GtkAdjustment * adjustment, void * user_data)
-{
-    SET_INT("vbr_quality_val",
-        gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vbr_quality_spin)));
-}
-
-static void abr_changed (GtkComboBox * combo)
-{
-    int i = gtk_combo_box_get_active (combo);
-
-    if (i >= 0 && i < aud::n_elems (available_bitrates))
-        SET_INT("abr_val", available_bitrates[i]);
-    else
-        SET_INT("abr_val", 128);
-}
-
-static void toggle_xing(GtkToggleButton * togglebutton, void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(xing_header_toggle)))
-        SET_INT("toggle_xing_val", 0);
-    else
-        SET_INT("toggle_xing_val", 1);
-}
-
-static void toggle_original(GtkToggleButton * togglebutton,
-                            void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_original_toggle)))
-        SET_INT("mark_original_val", 1);
-    else
-        SET_INT("mark_original_val", 0);
-}
-
-static void toggle_copyright(GtkToggleButton * togglebutton,
-                             void * user_data)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_copyright_toggle)))
-        SET_INT("mark_copyright_val", 1);
-    else
-        SET_INT("mark_copyright_val", 0);
-}
-
-static void force_v2_toggle(GtkToggleButton * togglebutton,
-                            void * user_data)
-{
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_force_id3v2_toggle))) {
-        SET_INT("force_v2_val", 1);
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_only_v1_toggle))) {
-            inside = 1;
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tags_only_v1_toggle), false);
-            SET_INT("only_v1_val", 0);
-            inside = 0;
-        }
-    }
-    else
-        SET_INT("force_v2_val", 0);
-
-}
-
-static void id3_only_version(GtkToggleButton * togglebutton,
-                             void * user_data)
-{
-    if (!strcmp((char *) user_data, "v1") && inside != 1) {
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_only_v1_toggle)))
-        {
-            inside = 1;
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tags_only_v2_toggle), false);
-            SET_INT("only_v1_val", 1);
-            SET_INT("only_v2_val", 0);
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tags_force_id3v2_toggle), false);
-            inside = 0;
-        }
-    }
-    else if (!strcmp((char *) user_data, "v2") && inside != 1) {
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tags_only_v2_toggle)))
-        {
-            inside = 1;
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tags_only_v1_toggle), false);
-            SET_INT("only_v1_val", 0);
-            SET_INT("only_v2_val", 1);
-            inside = 0;
-        }
-    }
-
-}
-
-/************************/
-/* Configuration Widget */
-/************************/
-
-void * mp3_configure ()
-{
-        notebook = gtk_notebook_new();
-
-        /* Quality */
-
-        quality_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 5);
-
-        quality_hbox1 = gtk_hbox_new (false, 5);
-        gtk_box_pack_start(GTK_BOX(quality_vbox), quality_hbox1, false, false, 0);
-
-        /* Algorithm Quality */
-
-        alg_quality_frame = gtk_frame_new(_("Algorithm Quality:"));
-        gtk_box_pack_start(GTK_BOX(quality_hbox1), alg_quality_frame, true, true, 0);
-
-        alg_quality_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(alg_quality_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(alg_quality_frame),
-                          alg_quality_hbox);
-
-        alg_quality_adj = (GtkAdjustment *) gtk_adjustment_new (5, 0, 9, 1, 1, 0);
-        alg_quality_spin =
-            gtk_spin_button_new(GTK_ADJUSTMENT(alg_quality_adj), 8, 0);
-        gtk_box_pack_start(GTK_BOX(alg_quality_hbox), alg_quality_spin, false, false, 0);
-        g_signal_connect (alg_quality_adj, "value-changed", (GCallback)
-         algo_qual, nullptr);
-
-        gtk_spin_button_set_value(GTK_SPIN_BUTTON(alg_quality_spin),
-                                  GET_INT("algo_quality_val"));
-
-        /* Output Samplerate */
-
-        samplerate_frame = gtk_frame_new(_("Output Sample Rate:"));
-        gtk_box_pack_start(GTK_BOX(quality_hbox1), samplerate_frame, true, true, 0);
-
-        samplerate_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(samplerate_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(samplerate_frame),
-                          samplerate_hbox);
-
-        GtkWidget * combo = gtk_combo_box_text_new ();
-        gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, _("Auto"));
-
-        const int out_samplerate_val = GET_INT("out_samplerate_val");
-        if (! out_samplerate_val)
-            gtk_combo_box_set_active ((GtkComboBox *) combo, 0);
-
-        for (int i = 0; i < aud::n_elems (available_samplerates); i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             int_to_str (available_samplerates[i]));
-
-            if (out_samplerate_val == available_samplerates[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, 1 + i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) samplerate_hbox, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) samplerate_changed, nullptr);
-
-        samplerate_label = gtk_label_new(_("(Hz)"));
-        gtk_misc_set_alignment(GTK_MISC(samplerate_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(samplerate_hbox), samplerate_label, false, false, 0);
-
-        /* Encoder Quality */
-
-        enc_quality_frame = gtk_frame_new(_("Bitrate / Compression Ratio:"));
-        gtk_box_pack_start(GTK_BOX(quality_vbox), enc_quality_frame, false, false, 0);
-
-        // vbox sorrounding hbox1 and hbox2
-        enc_quality_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(enc_quality_vbox), 5);
-
-        // pack vbox to frame
-        gtk_container_add(GTK_CONTAINER(enc_quality_frame), enc_quality_vbox);
-
-        // hbox1 for bitrate
-        hbox1 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox1);
-
-        // radio 1
-        enc_radio1 = gtk_radio_button_new(nullptr);
-        gtk_box_pack_start(GTK_BOX(hbox1), enc_radio1, false, false, 0);
-
-        // label 1
-        enc_quality_label1 = gtk_label_new(_("Bitrate (kbps):"));
-        gtk_box_pack_start(GTK_BOX(hbox1), enc_quality_label1, false, false, 0);
-
-        // bitrate menu
-
-        combo = gtk_combo_box_text_new ();
-
-        const int bitrate_val = GET_INT("bitrate_val");
-        for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             int_to_str (available_bitrates[i]));
-
-            if (bitrate_val == available_bitrates[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) hbox1, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) bitrate_changed, nullptr);
-
-        // hbox2 for compression ratio
-        hbox2 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox2);
-
-        // radio 2
-        enc_radio2 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(enc_radio1));
-        gtk_box_pack_start(GTK_BOX(hbox2), enc_radio2, false, false, 0);
-
-        // label
-        enc_quality_label2 = gtk_label_new(_("Compression ratio:"));
-        gtk_box_pack_start(GTK_BOX(hbox2), enc_quality_label2, false, false, 0);
-
-        // comp-ratio spin
-        compression_adj = (GtkAdjustment *) gtk_adjustment_new (11, 0, 100, 1, 1, 0);
-        compression_spin =
-            gtk_spin_button_new(GTK_ADJUSTMENT(compression_adj), 8, 0);
-        gtk_box_pack_start(GTK_BOX(hbox2), compression_spin, false, false, 0);
-
-        g_signal_connect (compression_adj, "value-changed", (GCallback)
-         compression_change, nullptr);
-
-        gtk_spin_button_set_value(GTK_SPIN_BUTTON(compression_spin),
-                                  GET_DOUBLE("compression_val"));
-
-        if (GET_INT("enc_toggle_val") == 0)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enc_radio1), true);
-        else
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enc_radio2), true);
-
-        // radio button signale connect
-        g_signal_connect (enc_radio1, "toggled", (GCallback) encoding_toggle,
-         GINT_TO_POINTER (0));
-        g_signal_connect (enc_radio2, "toggled", (GCallback) encoding_toggle,
-         GINT_TO_POINTER (1));
-
-        /* Audio Mode */
-
-        mode_frame = gtk_frame_new(_("Audio Mode:"));
-        gtk_box_pack_start(GTK_BOX(quality_vbox), mode_frame, false, false, 0);
-
-        mode_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(mode_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(mode_frame), mode_hbox);
-
-        combo = gtk_combo_box_text_new ();
-
-        const int audio_mode_val = GET_INT("audio_mode_val");
-        for (int i = 0; i < MODES; i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             _(mode_names[i]));
-
-            if (audio_mode_val == modes[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) mode_hbox, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) mode_changed, nullptr);
-
-        /* Misc */
-
-        misc_frame = gtk_frame_new(_("Miscellaneous:"));
-        gtk_box_pack_start(GTK_BOX(quality_vbox), misc_frame, false, false, 0);
-
-        misc_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(misc_vbox), 5);
-        gtk_container_add(GTK_CONTAINER(misc_frame), misc_vbox);
-
-        enforce_iso_toggle =
-            gtk_check_button_new_with_label
-            (_("Enforce strict ISO compliance"));
-        gtk_box_pack_start(GTK_BOX(misc_vbox), enforce_iso_toggle, true, true, 0);
-        g_signal_connect (enforce_iso_toggle, "toggled", (GCallback)
-         toggle_enforce_iso, nullptr);
-
-        if (GET_INT("enforce_iso_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (enforce_iso_toggle), true);
-
-        error_protection_toggle =
-            gtk_check_button_new_with_label(_("Error protection"));
-        gtk_box_pack_start(GTK_BOX(misc_vbox), error_protection_toggle, true, true, 0);
-        g_signal_connect (error_protection_toggle, "toggled", (GCallback)
-         toggle_error_protect, nullptr);
-
-        if (GET_INT("error_protect_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (error_protection_toggle), true);
-
-        /* Add the Notebook */
-        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), quality_vbox,
-                                 gtk_label_new(_("Quality")));
-
-        /* VBR/ABR */
-
-        vbr_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(vbr_vbox), 5);
-
-        /* Toggle VBR */
-
-        vbr_toggle = gtk_check_button_new_with_label(_("Enable VBR/ABR"));
-        gtk_box_pack_start(GTK_BOX(vbr_vbox), vbr_toggle, false, false, 0);
-        g_signal_connect (vbr_toggle, "toggled", (GCallback) toggle_vbr, nullptr);
-
-        vbr_options_vbox = gtk_vbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(vbr_vbox), vbr_options_vbox);
-        gtk_widget_set_sensitive(vbr_options_vbox, false);
-
-        /* Choose VBR/ABR */
-
-        vbr_type_frame = gtk_frame_new(_("Type:"));
-        gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_type_frame, false, false, 0);
-
-        vbr_type_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(vbr_type_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(vbr_type_frame), vbr_type_hbox);
-
-        vbr_type_radio1 = gtk_radio_button_new_with_label(nullptr, "VBR");
-        gtk_box_pack_start(GTK_BOX(vbr_type_hbox), vbr_type_radio1, false, false, 0);
-
-        vbr_type_radio2 =
-            gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON
-                                                        (vbr_type_radio1),
-                                                        "ABR");
-        gtk_box_pack_start(GTK_BOX(vbr_type_hbox), vbr_type_radio2, false, false, 0);
-
-        if (GET_INT("vbr_type") == 0)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_type_radio1), true);
-        else
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_type_radio2), true);
-
-        g_signal_connect (vbr_type_radio1, "toggled", (GCallback)
-         vbr_abr_toggle, (void *) "VBR");
-        g_signal_connect (vbr_type_radio2, "toggled", (GCallback)
-         vbr_abr_toggle, (void *) "ABR");
-
-        /* VBR Options */
-
-        vbr_frame = gtk_frame_new(_("VBR Options:"));
-        gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_frame, false, false, 0);
-
-        vbr_options_vbox2 = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(vbr_options_vbox2), 5);
-        gtk_container_add(GTK_CONTAINER(vbr_frame), vbr_options_vbox2);
-
-        vbr_options_hbox1 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
-                          vbr_options_hbox1);
-
-        vbr_min_label = gtk_label_new(_("Minimum bitrate (kbps):"));
-        gtk_misc_set_alignment(GTK_MISC(vbr_min_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(vbr_options_hbox1), vbr_min_label, false, false, 0);
-
-        combo = gtk_combo_box_text_new ();
-
-        const int vbr_min_val = GET_INT("vbr_min_val");
-        for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             int_to_str (available_bitrates[i]));
-
-            if (vbr_min_val == available_bitrates[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) vbr_options_hbox1, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) vbr_min_changed, nullptr);
-
-        vbr_options_hbox2 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
-                          vbr_options_hbox2);
-
-        vbr_max_label = gtk_label_new(_("Maximum bitrate (kbps):"));
-        gtk_misc_set_alignment(GTK_MISC(vbr_max_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(vbr_options_hbox2), vbr_max_label, false, false, 0);
-
-        combo = gtk_combo_box_text_new ();
-
-        const int vbr_max_val = GET_INT("vbr_max_val");
-        for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             int_to_str (available_bitrates[i]));
-
-            if (vbr_max_val == available_bitrates[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) vbr_options_hbox2, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) vbr_max_changed, nullptr);
-
-        enforce_min_toggle =
-            gtk_check_button_new_with_label
-            (_("Strictly enforce minimum bitrate"));
-        gtk_box_pack_start(GTK_BOX(vbr_options_vbox2), enforce_min_toggle, false, false, 0);
-        g_signal_connect (enforce_min_toggle, "toggled", (GCallback)
-         toggle_enforce_min, nullptr);
-
-        if (GET_INT("enforce_min_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (enforce_min_toggle), true);
-
-        /* ABR Options */
-
-        abr_frame = gtk_frame_new(_("ABR Options:"));
-        gtk_box_pack_start(GTK_BOX(vbr_options_vbox), abr_frame, false, false, 0);
-        gtk_widget_set_sensitive(abr_frame, false);
-
-        abr_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(abr_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(abr_frame), abr_hbox);
-
-        abr_label = gtk_label_new(_("Average bitrate (kbps):"));
-        gtk_misc_set_alignment(GTK_MISC(abr_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(abr_hbox), abr_label, false, false, 0);
-
-        combo = gtk_combo_box_text_new ();
-
-        const int abr_val = GET_INT("abr_val");
-        for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
-        {
-            gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
-             int_to_str (available_bitrates[i]));
-
-            if (abr_val == available_bitrates[i])
-                gtk_combo_box_set_active ((GtkComboBox *) combo, i);
-        }
-
-        gtk_box_pack_start ((GtkBox *) abr_hbox, combo, false, false, 0);
-        g_signal_connect (combo, "changed", (GCallback) abr_changed, nullptr);
-
-        /* Quality Level */
-
-        vbr_options_hbox3 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(vbr_options_vbox),
-                          vbr_options_hbox3);
-
-        vbr_quality_label = gtk_label_new(_("VBR quality level:"));
-        gtk_misc_set_alignment(GTK_MISC(vbr_quality_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_label, false, false, 0);
-
-        vbr_quality_adj = (GtkAdjustment *) gtk_adjustment_new (4, 0, 9, 1, 1, 0);
-        vbr_quality_spin =
-            gtk_spin_button_new(GTK_ADJUSTMENT(vbr_quality_adj), 8, 0);
-        gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_spin, false, false, 0);
-        g_signal_connect (vbr_quality_adj, "value-changed", (GCallback)
-         vbr_qual, nullptr);
-
-        gtk_spin_button_set_value(GTK_SPIN_BUTTON(vbr_quality_spin),
-                                  GET_INT("vbr_quality_val"));
-
-        /* Xing Header */
-
-        xing_header_toggle =
-            gtk_check_button_new_with_label(_("Omit Xing VBR header"));
-        gtk_box_pack_start(GTK_BOX(vbr_options_vbox), xing_header_toggle, false, false, 0);
-        g_signal_connect (xing_header_toggle, "toggled", (GCallback)
-         toggle_xing, nullptr);
-
-        if (GET_INT("toggle_xing_val") == 0)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (xing_header_toggle), true);
-
-        /* Add the Notebook */
-
-        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbr_vbox,
-                                 gtk_label_new(_("VBR/ABR")));
-
-        /* Tags */
-
-        tags_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(tags_vbox), 5);
-
-        /* Frame Params */
-
-        tags_frames_frame = gtk_frame_new(_("Frame Parameters:"));
-        gtk_box_pack_start(GTK_BOX(tags_vbox), tags_frames_frame, false, false, 0);
-
-        tags_frames_hbox = gtk_hbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(tags_frames_hbox), 5);
-        gtk_container_add(GTK_CONTAINER(tags_frames_frame),
-                          tags_frames_hbox);
-
-        tags_copyright_toggle =
-            gtk_check_button_new_with_label(_("Mark as copyright"));
-        gtk_box_pack_start(GTK_BOX(tags_frames_hbox),
-                           tags_copyright_toggle, false, false, 0);
-        g_signal_connect (tags_copyright_toggle, "toggled", (GCallback)
-         toggle_copyright, nullptr);
-
-        if (GET_INT("mark_copyright_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (tags_copyright_toggle), true);
-
-        tags_original_toggle =
-            gtk_check_button_new_with_label(_("Mark as original"));
-        gtk_box_pack_start(GTK_BOX(tags_frames_hbox), tags_original_toggle, false, false, 0);
-        g_signal_connect (tags_original_toggle, "toggled", (GCallback)
-         toggle_original, nullptr);
-
-        if (GET_INT("mark_original_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (tags_original_toggle), true);
-
-        /* ID3 Params */
-
-        tags_id3_frame = gtk_frame_new(_("ID3 Parameters:"));
-        gtk_box_pack_start(GTK_BOX(tags_vbox), tags_id3_frame, false, false, 0);
-
-        tags_id3_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(tags_id3_vbox), 5);
-        gtk_container_add(GTK_CONTAINER(tags_id3_frame), tags_id3_vbox);
-
-        tags_force_id3v2_toggle =
-            gtk_check_button_new_with_label
-            (_("Force addition of version 2 tag"));
-        gtk_box_pack_start(GTK_BOX(tags_id3_vbox), tags_force_id3v2_toggle, false, false, 0);
-        g_signal_connect (tags_force_id3v2_toggle, "toggled", (GCallback)
-         force_v2_toggle, nullptr);
-
-        tags_id3_hbox = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(tags_id3_vbox), tags_id3_hbox);
-
-        tags_only_v1_toggle =
-            gtk_check_button_new_with_label(_("Only add v1 tag"));
-        gtk_box_pack_start(GTK_BOX(tags_id3_hbox), tags_only_v1_toggle, false, false, 0);
-        g_signal_connect (tags_only_v1_toggle, "toggled", (GCallback)
-         id3_only_version, (void *) "v1");
-
-        tags_only_v2_toggle =
-            gtk_check_button_new_with_label(_("Only add v2 tag"));
-        gtk_box_pack_start(GTK_BOX(tags_id3_hbox), tags_only_v2_toggle, false, false, 0);
-        g_signal_connect (tags_only_v2_toggle, "toggled", (GCallback)
-         id3_only_version, (void *) "v2");
-
-        if (GET_INT("force_v2_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (tags_force_id3v2_toggle), true);
-
-        if (GET_INT("only_v1_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (tags_only_v1_toggle), true);
-
-        if (GET_INT("only_v2_val") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                         (tags_only_v2_toggle), true);
-
-        /* Add the Notebook */
-
-        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tags_vbox,
-                                 gtk_label_new(_("Tags")));
-
-        /* Set States */
-
-        if (GET_INT("vbr_on") == 1)
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_toggle),
-                                         true);
-        else
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_toggle),
-                                         false);
-
-        return notebook;
 }
 
 static int mp3_format_required (int fmt)
diff --git a/src/filewriter/vorbis.cc b/src/filewriter/vorbis.cc
index e8d2107..bc086fb 100644
--- a/src/filewriter/vorbis.cc
+++ b/src/filewriter/vorbis.cc
@@ -25,7 +25,6 @@
 
 #include <stdlib.h>
 #include <vorbis/vorbisenc.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -44,8 +43,7 @@ static const char * const vorbis_defaults[] = {
  "base_quality", "0.5",
  nullptr};
 
-#define GET_DOUBLE(n)    aud_get_double("filewriter_vorbis", n)
-#define SET_DOUBLE(n, v) aud_set_double("filewriter_vorbis", n, v)
+#define GET_DOUBLE(n) aud_get_double("filewriter_vorbis", n)
 
 static int channels;
 
@@ -177,45 +175,6 @@ static void vorbis_close (VFSFile & file)
     vorbis_info_clear(&vi);
 }
 
-/* configuration stuff */
-static GtkWidget *quality_frame, *quality_vbox, *quality_hbox1, *quality_spin, *quality_label;
-static GtkAdjustment * quality_adj;
-
-static void quality_change(GtkAdjustment *adjustment, void * user_data)
-{
-    SET_DOUBLE ("base_quality", gtk_spin_button_get_value ((GtkSpinButton *) quality_spin) / 10);
-}
-
-void * vorbis_configure ()
-{
-        GtkWidget * vbox = gtk_vbox_new (false, 5);
-
-        /* quality options */
-        quality_frame = gtk_frame_new(_("Quality"));
-        gtk_box_pack_start(GTK_BOX(vbox), quality_frame, false, false, 0);
-
-        quality_vbox = gtk_vbox_new (false, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 5);
-        gtk_container_add(GTK_CONTAINER(quality_frame), quality_vbox);
-
-        /* quality option: vbr level */
-        quality_hbox1 = gtk_hbox_new (false, 5);
-        gtk_container_add(GTK_CONTAINER(quality_vbox), quality_hbox1);
-
-        quality_label = gtk_label_new(_("Quality level (0 - 10):"));
-        gtk_misc_set_alignment(GTK_MISC(quality_label), 0, 0.5);
-        gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_label, false, false, 0);
-
-        quality_adj = (GtkAdjustment *) gtk_adjustment_new (5, 0, 10, 0.1, 1, 0);
-        quality_spin = gtk_spin_button_new(GTK_ADJUSTMENT(quality_adj), 1, 2);
-        gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_spin, false, false, 0);
-        g_signal_connect(G_OBJECT(quality_adj), "value-changed", G_CALLBACK(quality_change), nullptr);
-
-        gtk_spin_button_set_value(GTK_SPIN_BUTTON(quality_spin), GET_DOUBLE("base_quality") * 10);
-
-        return vbox;
-}
-
 static int vorbis_format_required (int fmt)
 {
     return FMT_FLOAT;
diff --git a/src/flacng/Makefile b/src/flac/Makefile
index fb53a2b..fb53a2b 100644
--- a/src/flacng/Makefile
+++ b/src/flac/Makefile
diff --git a/src/flacng/flacng.h b/src/flac/flacng.h
index 1f1d9aa..5a755d8 100644
--- a/src/flacng/flacng.h
+++ b/src/flac/flacng.h
@@ -37,18 +37,15 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo(FlagWritesTag)
+    constexpr FLACng() : InputPlugin(info, InputInfo(FlagWritesTag)
         .with_priority(1)
-        .with_exts(exts);
-
-    constexpr FLACng() : InputPlugin(info, iinfo) {}
+        .with_exts(exts)) {}
 
     bool init();
     void cleanup();
 
     bool is_our_file(const char *filename, VFSFile &file);
-    Tuple read_tuple(const char *filename, VFSFile &file);
-    Index<char> read_image(const char *filename, VFSFile &file);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
     bool write_tuple(const char *filename, VFSFile &file, const Tuple &tuple);
     bool play(const char *filename, VFSFile &file);
 };
diff --git a/src/flacng/metadata.cc b/src/flac/metadata.cc
index cb413bf..ee30d0d 100644
--- a/src/flacng/metadata.cc
+++ b/src/flac/metadata.cc
@@ -162,6 +162,7 @@ bool FLACng::write_tuple(const char *filename, VFSFile &file, const Tuple &tuple
     insert_str_tuple_to_vc(vc_block, tuple, Tuple::Title, "TITLE");
     insert_str_tuple_to_vc(vc_block, tuple, Tuple::Artist, "ARTIST");
     insert_str_tuple_to_vc(vc_block, tuple, Tuple::Album, "ALBUM");
+    insert_str_tuple_to_vc(vc_block, tuple, Tuple::AlbumArtist, "ALBUMARTIST");
     insert_str_tuple_to_vc(vc_block, tuple, Tuple::Genre, "GENRE");
     insert_str_tuple_to_vc(vc_block, tuple, Tuple::Comment, "COMMENT");
 
@@ -187,55 +188,6 @@ ERR:
     return false;
 }
 
-Index<char> FLACng::read_image(const char *filename, VFSFile &file)
-{
-    AUDDBG("Probe for song image.\n");
-
-    FLAC__Metadata_Iterator *iter;
-    FLAC__Metadata_Chain *chain;
-    FLAC__StreamMetadata *metadata = nullptr;
-    FLAC__Metadata_ChainStatus status;
-
-    Index<char> data;
-
-    chain = FLAC__metadata_chain_new();
-
-    if (!FLAC__metadata_chain_read_with_callbacks(chain, &file, io_callbacks))
-        goto ERR;
-
-    iter = FLAC__metadata_iterator_new();
-
-    FLAC__metadata_iterator_init(iter, chain);
-
-    while (FLAC__metadata_iterator_next(iter))
-        if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_PICTURE)
-            break;
-
-    if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_PICTURE)
-    {
-        metadata = FLAC__metadata_iterator_get_block(iter);
-
-        if (metadata->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
-        {
-            AUDDBG("FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER found.");
-            data.insert ((const char *) metadata->data.picture.data, 0,
-             metadata->data.picture.data_length);
-        }
-    }
-
-    FLAC__metadata_iterator_delete(iter);
-    FLAC__metadata_chain_delete(chain);
-
-    return data;
-
-ERR:
-    status = FLAC__metadata_chain_status(chain);
-    FLAC__metadata_chain_delete(chain);
-
-    AUDERR("An error occured: %s\n", FLAC__Metadata_ChainStatusString[status]);
-    return data;
-}
-
 static void add_text (Tuple & tuple, Tuple::Field field, const char * value)
 {
     String cur = tuple.get_str (field);
@@ -255,6 +207,7 @@ static void parse_comment (Tuple & tuple, const char * key, const char * value)
     } tfields[] = {
         {"ARTIST", Tuple::Artist},
         {"ALBUM", Tuple::Album},
+        {"ALBUMARTIST", Tuple::AlbumArtist},
         {"TITLE", Tuple::Title},
         {"COMMENT", Tuple::Comment},
         {"GENRE", Tuple::Genre}
@@ -283,11 +236,10 @@ static void parse_comment (Tuple & tuple, const char * key, const char * value)
         tuple.set_gain(Tuple::AlbumPeak, Tuple::PeakDivisor, value);
 }
 
-Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
+bool FLACng::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image)
 {
     AUDDBG("Probe for tuple.\n");
 
-    Tuple tuple;
     FLAC__Metadata_Iterator *iter;
     FLAC__Metadata_Chain *chain;
     FLAC__StreamMetadata *metadata = nullptr;
@@ -296,8 +248,6 @@ Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
     char *key;
     char *value;
 
-    tuple.set_filename (filename);
-
     tuple.set_str (Tuple::Codec, "Free Lossless Audio Codec (FLAC)");
     tuple.set_str (Tuple::Quality, _("lossless"));
 
@@ -315,29 +265,27 @@ Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
         switch (FLAC__metadata_iterator_get_block_type(iter))
         {
             case FLAC__METADATA_TYPE_VORBIS_COMMENT:
+            {
+                metadata = FLAC__metadata_iterator_get_block(iter);
 
-                if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_VORBIS_COMMENT)
-                {
-                    metadata = FLAC__metadata_iterator_get_block(iter);
-
-                    AUDDBG("Vorbis comment contains %d fields\n", metadata->data.vorbis_comment.num_comments);
-                    AUDDBG("Vendor string: %s\n", metadata->data.vorbis_comment.vendor_string.entry);
+                AUDDBG("Vorbis comment contains %d fields\n", metadata->data.vorbis_comment.num_comments);
+                AUDDBG("Vendor string: %s\n", metadata->data.vorbis_comment.vendor_string.entry);
 
-                    entry = metadata->data.vorbis_comment.comments;
+                entry = metadata->data.vorbis_comment.comments;
 
-                    for (unsigned i = 0; i < metadata->data.vorbis_comment.num_comments; i++, entry++)
+                for (unsigned i = 0; i < metadata->data.vorbis_comment.num_comments; i++, entry++)
+                {
+                    if (FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(*entry, &key, &value) == false)
+                        AUDDBG("Could not parse comment\n");
+                    else
                     {
-                        if (FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(*entry, &key, &value) == false)
-                            AUDDBG("Could not parse comment\n");
-                        else
-                        {
-                            parse_comment(tuple, key, value);
-                            free(key);
-                            free(value);
-                        }
+                        parse_comment(tuple, key, value);
+                        free(key);
+                        free(value);
                     }
                 }
                 break;
+            }
 
             case FLAC__METADATA_TYPE_STREAMINFO:
             {
@@ -370,6 +318,22 @@ Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
                 break;
             }
 
+            case FLAC__METADATA_TYPE_PICTURE:
+            {
+                if (image && !image->len())
+                {
+                    metadata = FLAC__metadata_iterator_get_block(iter);
+
+                    if (metadata->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
+                    {
+                        AUDDBG("FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER found.");
+                        image->insert((const char *) metadata->data.picture.data, 0,
+                         metadata->data.picture.data_length);
+                    }
+                }
+                break;
+            }
+
             default:
                 ;
         }
@@ -378,12 +342,12 @@ Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
     FLAC__metadata_iterator_delete(iter);
     FLAC__metadata_chain_delete(chain);
 
-    return tuple;
+    return true;
 
 ERR:
     status = FLAC__metadata_chain_status(chain);
     FLAC__metadata_chain_delete(chain);
 
     AUDERR("An error occured: %s\n", FLAC__Metadata_ChainStatusString[status]);
-    return tuple;
+    return false;
 }
diff --git a/src/flacng/plugin.cc b/src/flac/plugin.cc
index 444e2b4..444e2b4 100644
--- a/src/flacng/plugin.cc
+++ b/src/flac/plugin.cc
diff --git a/src/flacng/seekable_stream_callbacks.cc b/src/flac/seekable_stream_callbacks.cc
index 8b3e7aa..8b3e7aa 100644
--- a/src/flacng/seekable_stream_callbacks.cc
+++ b/src/flac/seekable_stream_callbacks.cc
diff --git a/src/flacng/tools.cc b/src/flac/tools.cc
index e5c1a23..e5c1a23 100644
--- a/src/flacng/tools.cc
+++ b/src/flac/tools.cc
diff --git a/src/gio/gio.cc b/src/gio/gio.cc
index 73f020e..c782663 100644
--- a/src/gio/gio.cc
+++ b/src/gio/gio.cc
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include <gio/gio.h>
 
@@ -33,7 +34,7 @@ static const char gio_about[] =
  N_("GIO Plugin for Audacious\n"
     "Copyright 2009-2012 John Lindgren");
 
-static const char * const gio_schemes[] = {"ftp", "sftp", "smb"};
+static const char * const gio_schemes[] = {"ftp", "sftp", "smb", "mtp"};
 
 class GIOTransport : public TransportPlugin
 {
@@ -43,6 +44,8 @@ public:
     constexpr GIOTransport () : TransportPlugin (info, gio_schemes) {}
 
     VFSImpl * fopen (const char * path, const char * mode, String & error);
+    VFSFileTest test_file (const char * filename, VFSFileTest test, String & error);
+    Index<String> read_folder (const char * filename, String & error);
 };
 
 EXPORT GIOTransport aud_plugin_instance;
@@ -368,3 +371,80 @@ int GIOFile::fflush ()
 FAILED:
     return -1;
 }
+
+VFSFileTest GIOTransport::test_file (const char * filename, VFSFileTest test, String & error)
+{
+    GFile * file = g_file_new_for_uri (filename);
+    Index<String> attrs;
+    int passed = 0;
+
+    if (test & (VFS_IS_REGULAR | VFS_IS_DIR))
+        attrs.append (G_FILE_ATTRIBUTE_STANDARD_TYPE);
+    if (test & VFS_IS_SYMLINK)
+        attrs.append (G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK);
+    if (test & VFS_IS_EXECUTABLE)
+        attrs.append (G_FILE_ATTRIBUTE_UNIX_MODE);
+
+    GError * gerr = nullptr;
+    GFileInfo * info = g_file_query_info (file, index_to_str_list (attrs, ","),
+     G_FILE_QUERY_INFO_NONE, nullptr, & gerr);
+
+    if (! info)
+    {
+        passed |= VFS_NO_ACCESS;
+        error = String (gerr->message);
+        g_error_free (gerr);
+    }
+    else
+    {
+        passed |= VFS_EXISTS;
+
+        switch (g_file_info_get_file_type (info))
+        {
+            case G_FILE_TYPE_REGULAR: passed |= VFS_IS_REGULAR; break;
+            case G_FILE_TYPE_DIRECTORY: passed |= VFS_IS_DIR; break;
+            default: break;
+        };
+
+        if (g_file_info_get_is_symlink (info))
+            passed |= VFS_IS_SYMLINK;
+        if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE) & S_IXUSR)
+            passed |= VFS_IS_EXECUTABLE;
+
+        g_object_unref (info);
+    }
+
+    g_object_unref (file);
+    return VFSFileTest (test & passed);
+}
+
+Index<String> GIOTransport::read_folder (const char * filename, String & error)
+{
+    GFile * file = g_file_new_for_uri (filename);
+    Index<String> files;
+
+    GError * gerr = nullptr;
+    GFileEnumerator * dir = g_file_enumerate_children (file,
+     G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NONE, nullptr, & gerr);
+
+    if (! dir)
+    {
+        error = String (gerr->message);
+        g_error_free (gerr);
+    }
+    else
+    {
+        GFileInfo * info;
+        while ((info = g_file_enumerator_next_file (dir, nullptr, nullptr)))
+        {
+            StringBuf enc = str_encode_percent (g_file_info_get_name (info));
+            files.append (String (str_concat ({filename, "/", enc})));
+            g_object_unref (info);
+        }
+
+        g_object_unref (dir);
+    }
+
+    g_object_unref (file);
+    return files;
+}
diff --git a/src/gl-spectrum/Makefile b/src/glspectrum/Makefile
index 423054d..423054d 100644
--- a/src/gl-spectrum/Makefile
+++ b/src/glspectrum/Makefile
diff --git a/src/gl-spectrum/gl-spectrum.cc b/src/glspectrum/gl-spectrum.cc
index 2deb4af..a91f241 100644
--- a/src/gl-spectrum/gl-spectrum.cc
+++ b/src/glspectrum/gl-spectrum.cc
@@ -24,7 +24,6 @@
 #include <math.h>
 #include <string.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 
@@ -62,7 +61,9 @@ public:
     static constexpr PluginInfo info = {
         N_("OpenGL Spectrum Analyzer"),
         PACKAGE,
-        gl_about
+        gl_about,
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr GLSpectrum () : VisPlugin (info, Visualizer::Freq) {}
diff --git a/src/gtkui/columns.cc b/src/gtkui/columns.cc
index 2e53c51..daf5eda 100644
--- a/src/gtkui/columns.cc
+++ b/src/gtkui/columns.cc
@@ -113,12 +113,12 @@ void pw_col_init ()
 
     String widths = aud_get_str ("gtkui", "column_widths");
 
-    if (! str_to_int_array (widths, pw_col_widths, PW_COLS))
-    {
-        int dpi = audgui_get_dpi ();
-        for (int i = 0; i < PW_COLS; i ++)
-            pw_col_widths[i] = pw_default_widths[i] * dpi / 96;
-    }
+    int iwidths[PW_COLS];
+    bool valid = str_to_int_array (widths, iwidths, PW_COLS);
+    auto source = valid ? iwidths : pw_default_widths;
+
+    for (int i = 0; i < PW_COLS; i ++)
+        pw_col_widths[i] = audgui_to_native_dpi (source[i]);
 }
 
 struct Column {
@@ -350,6 +350,10 @@ void pw_col_save ()
     for (int i = 0; i < pw_num_cols; i ++)
         index.append (String (pw_col_keys[pw_cols[i]]));
 
+    int widths[PW_COLS];
+    for (int i = 0; i < PW_COLS; i ++)
+        widths[i] = audgui_to_portable_dpi (pw_col_widths[i]);
+
     aud_set_str ("gtkui", "playlist_columns", index_to_str_list (index, " "));
-    aud_set_str ("gtkui", "column_widths", int_array_to_str (pw_col_widths, PW_COLS));
+    aud_set_str ("gtkui", "column_widths", int_array_to_str (widths, PW_COLS));
 }
diff --git a/src/gtkui/layout.cc b/src/gtkui/layout.cc
index 08220c6..40b60b9 100644
--- a/src/gtkui/layout.cc
+++ b/src/gtkui/layout.cc
@@ -568,9 +568,12 @@ void layout_save ()
         snprintf (key, sizeof key, "item%d_name", i);
         aud_set_str ("gtkui-layout", key, item->name);
 
+        int temp_w = audgui_to_portable_dpi (item->w);
+        int temp_h = audgui_to_portable_dpi (item->h);
+
         snprintf (key, sizeof key, "item%d_pos", i);
         snprintf (value, sizeof value, "%d,%d,%d,%d,%d", item->dock, item->x,
-         item->y, item->w, item->h);
+         item->y, temp_w, temp_h);
         aud_set_str ("gtkui-layout", key, value);
 
         i ++;
@@ -593,9 +596,16 @@ void layout_load ()
         String name = aud_get_str ("gtkui-layout", key);
         Item * item = item_new (name);
 
+        int temp_w = 0, temp_h = 0;
+
         snprintf (key, sizeof key, "item%d_pos", i);
         String pos = aud_get_str ("gtkui-layout", key);
-        sscanf (pos, "%d,%d,%d,%d,%d", & item->dock, & item->x, & item->y, & item->w, & item->h);
+        sscanf (pos, "%d,%d,%d,%d,%d", & item->dock, & item->x, & item->y, & temp_w, & temp_h);
+
+        if (temp_w)
+            item->w = audgui_to_native_dpi (temp_w);
+        if (temp_h)
+            item->h = audgui_to_native_dpi (temp_h);
     }
 }
 
diff --git a/src/gtkui/menus.cc b/src/gtkui/menus.cc
index 90d41fb..58e7414 100644
--- a/src/gtkui/menus.cc
+++ b/src/gtkui/menus.cc
@@ -36,6 +36,8 @@
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
 
+#include "../ui-common/menu-ops.h"
+
 #define SHIFT GDK_SHIFT_MASK
 #define CTRL GDK_CONTROL_MASK
 #define ALT GDK_MOD1_MASK
@@ -54,42 +56,8 @@ static void configure_effects () { audgui_show_prefs_for_plugin_type (PluginType
 static void configure_output () { audgui_show_prefs_for_plugin_type (PluginType::Output); }
 static void configure_visualizations () { audgui_show_prefs_for_plugin_type (PluginType::Vis); }
 
-static void pl_sort_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void pl_sort_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_sort_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void pl_sort_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void pl_sort_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void pl_sort_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void pl_sort_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void pl_sort_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void pl_sort_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void pl_sort_custom () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void pl_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void pl_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void pl_sort_selected_track () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void pl_sort_selected_title () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_sort_selected_artist () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void pl_sort_selected_album () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void pl_sort_selected_album_artist () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void pl_sort_selected_date () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void pl_sort_selected_genre () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void pl_sort_selected_length () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void pl_sort_selected_path () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void pl_sort_selected_custom () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void pl_reverse_selected () { aud_playlist_reverse_selected (aud_playlist_get_active ()); }
-static void pl_random_selected () { aud_playlist_randomize_selected (aud_playlist_get_active ()); }
-
-static void pl_play () { aud_playlist_play (aud_playlist_get_active ()); }
-static void pl_refresh () { aud_playlist_rescan (aud_playlist_get_active ()); }
-static void pl_remove_failed () { aud_playlist_remove_failed (aud_playlist_get_active ()); }
-static void pl_remove_dupes_by_title () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_remove_dupes_by_filename () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Filename); }
-static void pl_remove_dupes_by_path () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Path); }
 static void pl_rename () { start_rename_playlist (aud_playlist_get_active ()); }
 static void pl_close () { audgui_confirm_playlist_delete (aud_playlist_get_active ()); }
-static void pl_refresh_sel () { aud_playlist_rescan_selected (aud_playlist_get_active ()); }
-static void pl_select_all () { aud_playlist_select_all (aud_playlist_get_active (), true); }
 
 static void pl_tab_play ()
 {
@@ -115,9 +83,6 @@ static void pl_tab_close ()
 static GtkWidget * get_services_main () { return audgui_get_plugin_menu (AudMenuID::Main); }
 static GtkWidget * get_services_pl () { return audgui_get_plugin_menu (AudMenuID::Playlist); }
 
-static void volume_up () { aud_drct_set_volume_main (aud_drct_get_volume_main () + 5); }
-static void volume_down () { aud_drct_set_volume_main (aud_drct_get_volume_main () - 5); }
-
 static void toggle_record ()
 {
     if (! aud_drct_enable_record (aud_get_bool ("gtkui", "record")))
@@ -163,41 +128,41 @@ static const AudguiMenuItem playback_items[] = {
 };
 
 static const AudguiMenuItem dupe_items[] = {
-    MenuCommand (N_("By _Title"), nullptr, NONE, pl_remove_dupes_by_title),
-    MenuCommand (N_("By _File Name"), nullptr, NONE, pl_remove_dupes_by_filename),
-    MenuCommand (N_("By File _Path"), nullptr, NONE, pl_remove_dupes_by_path)
+    MenuCommand (N_("By _Title"), nullptr, NONE, rm_dupes_title),
+    MenuCommand (N_("By _File Name"), nullptr, NONE, rm_dupes_filename),
+    MenuCommand (N_("By File _Path"), nullptr, NONE, rm_dupes_path)
 };
 
 static const AudguiMenuItem sort_items[] = {
-    MenuCommand (N_("By Track _Number"), nullptr, NONE, pl_sort_track),
-    MenuCommand (N_("By _Title"), nullptr, NONE, pl_sort_title),
-    MenuCommand (N_("By _Artist"), nullptr, NONE, pl_sort_artist),
-    MenuCommand (N_("By Al_bum"), nullptr, NONE, pl_sort_album),
-    MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, pl_sort_album_artist),
-    MenuCommand (N_("By Release _Date"), nullptr, NONE, pl_sort_date),
-    MenuCommand (N_("By _Genre"), nullptr, NONE, pl_sort_genre),
-    MenuCommand (N_("By _Length"), nullptr, NONE, pl_sort_length),
-    MenuCommand (N_("By _File Path"), nullptr, NONE, pl_sort_path),
-    MenuCommand (N_("By _Custom Title"), nullptr, NONE, pl_sort_custom),
+    MenuCommand (N_("By Track _Number"), nullptr, NONE, sort_track),
+    MenuCommand (N_("By _Title"), nullptr, NONE, sort_title),
+    MenuCommand (N_("By _Artist"), nullptr, NONE, sort_artist),
+    MenuCommand (N_("By Al_bum"), nullptr, NONE, sort_album),
+    MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, sort_album_artist),
+    MenuCommand (N_("By Release _Date"), nullptr, NONE, sort_date),
+    MenuCommand (N_("By _Genre"), nullptr, NONE, sort_genre),
+    MenuCommand (N_("By _Length"), nullptr, NONE, sort_length),
+    MenuCommand (N_("By _File Path"), nullptr, NONE, sort_path),
+    MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_custom_title),
     MenuSep (),
-    MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, pl_reverse),
-    MenuCommand (N_("_Random Order"), nullptr, NONE, pl_random)
+    MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, sort_reverse),
+    MenuCommand (N_("_Random Order"), nullptr, NONE, sort_random)
 };
 
-static const AudguiMenuItem sort_selected_items[] = {
-    MenuCommand (N_("By Track _Number"), nullptr, NONE, pl_sort_selected_track),
-    MenuCommand (N_("By _Title"), nullptr, NONE, pl_sort_selected_title),
-    MenuCommand (N_("By _Artist"), nullptr, NONE, pl_sort_selected_artist),
-    MenuCommand (N_("By Al_bum"), nullptr, NONE, pl_sort_selected_album),
-    MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, pl_sort_selected_album_artist),
-    MenuCommand (N_("By Release _Date"), nullptr, NONE, pl_sort_selected_date),
-    MenuCommand (N_("By _Genre"), nullptr, NONE, pl_sort_selected_genre),
-    MenuCommand (N_("By _Length"), nullptr, NONE, pl_sort_selected_length),
-    MenuCommand (N_("By _File Path"), nullptr, NONE, pl_sort_selected_path),
-    MenuCommand (N_("By _Custom Title"), nullptr, NONE, pl_sort_selected_custom),
+static const AudguiMenuItem sort_sel_items[] = {
+    MenuCommand (N_("By Track _Number"), nullptr, NONE, sort_sel_track),
+    MenuCommand (N_("By _Title"), nullptr, NONE, sort_sel_title),
+    MenuCommand (N_("By _Artist"), nullptr, NONE, sort_sel_artist),
+    MenuCommand (N_("By Al_bum"), nullptr, NONE, sort_sel_album),
+    MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, sort_sel_album_artist),
+    MenuCommand (N_("By Release _Date"), nullptr, NONE, sort_sel_date),
+    MenuCommand (N_("By _Genre"), nullptr, NONE, sort_sel_genre),
+    MenuCommand (N_("By _Length"), nullptr, NONE, sort_sel_length),
+    MenuCommand (N_("By _File Path"), nullptr, NONE, sort_sel_path),
+    MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_sel_custom_title),
     MenuSep (),
-    MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, pl_reverse_selected),
-    MenuCommand (N_("_Random Order"), nullptr, NONE, pl_random_selected)
+    MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, sort_sel_reverse),
+    MenuCommand (N_("_Random Order"), nullptr, NONE, sort_sel_random)
 };
 
 static const AudguiMenuItem playlist_items[] = {
@@ -205,7 +170,7 @@ static const AudguiMenuItem playlist_items[] = {
     MenuCommand (N_("_Refresh"), "view-refresh", GDK_KEY_F5, (GdkModifierType) 0, pl_refresh),
     MenuSep (),
     MenuSub (N_("_Sort"), "view-sort-ascending", {sort_items}),
-    MenuSub (N_("Sort Se_lected"), "view-sort-ascending", {sort_selected_items}),
+    MenuSub (N_("Sort Se_lected"), "view-sort-ascending", {sort_sel_items}),
     MenuSub (N_("Remove _Duplicates"), "edit-copy", {dupe_items}),
     MenuCommand (N_("Remove _Unavailable Files"), "dialog-warning", NONE, pl_remove_failed),
     MenuSep (),
@@ -252,15 +217,16 @@ static const AudguiMenuItem main_items[] = {
 };
 
 static const AudguiMenuItem rclick_items[] = {
-    MenuCommand (N_("Song _Info ..."), "dialog-information", 'i', ALT, playlist_song_info),
-    MenuCommand (N_("_Queue/Unqueue"), nullptr, 'q', ALT, playlist_queue_toggle),
+    MenuCommand (N_("Song _Info ..."), "dialog-information", 'i', ALT, pl_song_info),
+    MenuCommand (N_("_Queue/Unqueue"), nullptr, 'q', ALT, pl_queue_toggle),
     MenuSep (),
-    MenuCommand (N_("_Open Containing Folder"), "folder", NONE, playlist_open_folder),
-    MenuCommand (N_("_Refresh"), "view-refresh", GDK_KEY_F6, (GdkModifierType) 0, pl_refresh_sel),
+    MenuCommand (N_("_Open Containing Folder"), "folder", NONE, pl_open_folder),
+    MenuCommand (N_("_Refresh Selected"), "view-refresh", GDK_KEY_F6, (GdkModifierType) 0, pl_refresh_sel),
     MenuSep (),
-    MenuCommand (N_("Cu_t"), "edit-cut", NONE, playlist_cut),
-    MenuCommand (N_("_Copy"), "edit-copy", NONE, playlist_copy),
-    MenuCommand (N_("_Paste"), "edit-paste", NONE, playlist_paste),
+    MenuCommand (N_("Cu_t"), "edit-cut", NONE, pl_cut),
+    MenuCommand (N_("_Copy"), "edit-copy", NONE, pl_copy),
+    MenuCommand (N_("_Paste"), "edit-paste", NONE, pl_paste),
+    MenuCommand (N_("Paste at _End"), "edit-paste", 'v', SHIFT_CTRL, pl_paste_end),
     MenuCommand (N_("Select _All"), "edit-select-all", NONE, pl_select_all),
     MenuSep (),
     MenuSub (N_("_Services"), nullptr, get_services_pl)
diff --git a/src/gtkui/playlist_util.cc b/src/gtkui/playlist_util.cc
index 42d1c6a..05f5587 100644
--- a/src/gtkui/playlist_util.cc
+++ b/src/gtkui/playlist_util.cc
@@ -29,6 +29,8 @@
 #include "playlist_util.h"
 #include "ui_playlist_notebook.h"
 
+#include "../ui-common/menu-ops.h"
+
 GtkWidget * playlist_get_treeview (int playlist)
 {
     GtkWidget * page = gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, playlist);
@@ -52,100 +54,6 @@ int playlist_count_selected_in_range (int list, int top, int length)
     return selected;
 }
 
-void playlist_song_info ()
-{
-    int list = aud_playlist_get_active ();
-    int focus = aud_playlist_get_focus (list);
-
-    if (focus < 0)
-        return;
-
-    audgui_infowin_show (list, focus);
-}
-
-void playlist_open_folder ()
-{
-    int list = aud_playlist_get_active ();
-    int focus = aud_playlist_get_focus (list);
-
-    String filename = aud_playlist_entry_get_filename (list, focus);
-    if (! filename)
-        return;
-
-    const char * slash = strrchr (filename, '/');
-    if (! slash)
-        return;
-
-    /* don't trim trailing slash, it may be important */
-    StringBuf folder = str_copy (filename, slash + 1 - filename);
-
-    GError * error = nullptr;
-    gtk_show_uri (gdk_screen_get_default (), folder, GDK_CURRENT_TIME, & error);
-
-    if (error)
-    {
-        aud_ui_show_error (error->message);
-        g_error_free (error);
-    }
-}
-
-void playlist_queue_toggle ()
-{
-    int list = aud_playlist_get_active ();
-    int focus = aud_playlist_get_focus (list);
-
-    if (focus < 0)
-        return;
-
-    /* make sure focused row is selected */
-    if (! aud_playlist_entry_get_selected (list, focus))
-    {
-        aud_playlist_select_all (list, false);
-        aud_playlist_entry_set_selected (list, focus, true);
-    }
-
-    int at = aud_playlist_queue_find_entry (list, focus);
-
-    if (at < 0)
-        aud_playlist_queue_insert_selected (list, -1);
-    else
-        aud_playlist_queue_delete_selected (list);
-}
-
-void playlist_delete_selected ()
-{
-    int list = aud_playlist_get_active ();
-    aud_playlist_delete_selected (list);
-    aud_playlist_entry_set_selected (list, aud_playlist_get_focus (list), true);
-}
-
-void playlist_copy ()
-{
-    Index<char> text = audgui_urilist_create_from_selected (aud_playlist_get_active ());
-    if (! text.len ())
-        return;
-
-    gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), text.begin (), text.len ());
-}
-
-void playlist_cut ()
-{
-    playlist_copy ();
-    playlist_delete_selected ();
-}
-
-void playlist_paste ()
-{
-    char * text = gtk_clipboard_wait_for_text (gtk_clipboard_get
-     (GDK_SELECTION_CLIPBOARD));
-    if (! text)
-        return;
-
-    int list = aud_playlist_get_active ();
-    audgui_urilist_insert (list, aud_playlist_get_focus (list), text);
-    g_free (text);
-}
-
 void playlist_shift (int offset)
 {
     int list = aud_playlist_get_active ();
diff --git a/src/gtkui/playlist_util.h b/src/gtkui/playlist_util.h
index b13b1f5..66ce5cb 100644
--- a/src/gtkui/playlist_util.h
+++ b/src/gtkui/playlist_util.h
@@ -23,13 +23,6 @@
 GtkWidget * playlist_get_treeview (int playlist);
 
 int playlist_count_selected_in_range (int list, int top, int length);
-void playlist_song_info ();
-void playlist_open_folder ();
-void playlist_queue_toggle ();
-void playlist_delete_selected ();
-void playlist_copy ();
-void playlist_cut ();
-void playlist_paste ();
 void playlist_shift (int offset);
 
 #endif
diff --git a/src/gtkui/ui_gtk.cc b/src/gtkui/ui_gtk.cc
index 7b3f8de..e823f91 100644
--- a/src/gtkui/ui_gtk.cc
+++ b/src/gtkui/ui_gtk.cc
@@ -22,7 +22,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
@@ -43,6 +42,9 @@
 #include "ui_statusbar.h"
 #include "playlist_util.h"
 
+#include "../ui-common/menu-ops.cc"
+#include "../ui-common/menu-ops-gtk.cc"
+
 static const char * const gtkui_defaults[] = {
     "infoarea_show_vis", "TRUE",
     "infoarea_visible", "TRUE",
@@ -61,6 +63,8 @@ static const char * const gtkui_defaults[] = {
 
     "player_x", "-1000",
     "player_y", "-1000",
+    "player_width", "768",
+    "player_height", "480",
 
     nullptr
 };
@@ -72,7 +76,8 @@ public:
         N_("GTK Interface"),
         PACKAGE,
         nullptr,
-        & gtkui_prefs
+        & gtkui_prefs,
+        PluginGLibOnly
     };
 
     constexpr GtkUI () : IfacePlugin (info) {}
@@ -106,6 +111,9 @@ public:
         { audgui_plugin_menu_add (id, func, name, icon); }
     void plugin_menu_remove (AudMenuID id, void func ())
         { audgui_plugin_menu_remove (id, func); }
+
+    void startup_notify (const char * id)
+        { gdk_notify_startup_complete_with_id (id); }
 };
 
 EXPORT GtkUI aud_plugin_instance;
@@ -137,22 +145,16 @@ static void save_window_size ()
 
     aud_set_int ("gtkui", "player_x", x);
     aud_set_int ("gtkui", "player_y", y);
-    aud_set_int ("gtkui", "player_width", w);
-    aud_set_int ("gtkui", "player_height", h);
+    aud_set_int ("gtkui", "player_width", audgui_to_portable_dpi (w));
+    aud_set_int ("gtkui", "player_height", audgui_to_portable_dpi (h));
 }
 
 static void restore_window_size ()
 {
-    int dpi = audgui_get_dpi ();
     int x = aud_get_int ("gtkui", "player_x");
     int y = aud_get_int ("gtkui", "player_y");
-    int w = aud_get_int ("gtkui", "player_width");
-    int h = aud_get_int ("gtkui", "player_height");
-
-    if (w < 1)
-        w = 8 * dpi;
-    if (h < 1)
-        h = 5 * dpi;
+    int w = audgui_to_native_dpi (aud_get_int ("gtkui", "player_width"));
+    int h = audgui_to_native_dpi (aud_get_int ("gtkui", "player_height"));
 
     gtk_window_set_default_size ((GtkWindow *) window, w, h);
 
@@ -214,19 +216,23 @@ static void title_change (void * = nullptr)
 {
     delayed_title_change.stop ();
 
+    StringBuf title;
+
     if (aud_drct_get_playing ())
     {
         if (aud_drct_get_ready ())
-        {
-            String title = aud_drct_get_title ();
-            gtk_window_set_title ((GtkWindow *) window,
-             str_printf (_("%s - Audacious"), (const char *) title));
-        }
+            title.steal (str_printf (_("%s - Audacious"), (const char *) aud_drct_get_title ()));
         else
-            gtk_window_set_title ((GtkWindow *) window, _("Buffering ..."));
+            title.steal (str_copy (_("Buffering ...")));
     }
     else
-        gtk_window_set_title ((GtkWindow *) window, _("Audacious"));
+        title.steal (str_copy (_("Audacious")));
+
+    int instance = aud_get_instance ();
+    if (instance != 1)
+        title.combine (str_printf (" (%d)", instance));
+
+    gtk_window_set_title ((GtkWindow *) window, title);
 }
 
 void GtkUI::show (bool show)
@@ -334,11 +340,20 @@ static gboolean ui_slider_change_value_cb (GtkRange * range,
     return false;
 }
 
+/* return an object property if it exists, otherwise false */
+static bool get_boolean_prop (void * obj, const char * prop)
+{
+    gboolean value = false;
+    if (g_object_class_find_property (G_OBJECT_GET_CLASS (obj), prop))
+        g_object_get (obj, prop, & value, nullptr);
+
+    return value;
+}
+
 static gboolean ui_slider_button_press_cb (GtkWidget * widget, GdkEventButton * event)
 {
-    gboolean primary_warps = false;
-    g_object_get (gtk_widget_get_settings (widget),
-     "gtk-primary-button-warps-slider", & primary_warps, nullptr);
+    bool primary_warps = get_boolean_prop (gtk_widget_get_settings (widget),
+     "gtk-primary-button-warps-slider");
 
     if (event->button == 1 && ! primary_warps)
         event->button = 2;
@@ -349,9 +364,8 @@ static gboolean ui_slider_button_press_cb (GtkWidget * widget, GdkEventButton *
 
 static gboolean ui_slider_button_release_cb (GtkWidget * widget, GdkEventButton * event)
 {
-    gboolean primary_warps = false;
-    g_object_get (gtk_widget_get_settings (widget),
-     "gtk-primary-button-warps-slider", & primary_warps, nullptr);
+    bool primary_warps = get_boolean_prop (gtk_widget_get_settings (widget),
+     "gtk-primary-button-warps-slider");
 
     if (event->button == 1 && ! primary_warps)
         event->button = 2;
@@ -538,8 +552,7 @@ static gboolean window_keypress_cb (GtkWidget * widget, GdkEventKey * event)
         {
           case GDK_KEY_ISO_Left_Tab:
           case GDK_KEY_Tab:
-            aud_playlist_set_active ((aud_playlist_get_active () + 1) %
-             aud_playlist_count ());
+            pl_next ();
             break;
 
           default:
@@ -551,8 +564,7 @@ static gboolean window_keypress_cb (GtkWidget * widget, GdkEventKey * event)
         {
           case GDK_KEY_ISO_Left_Tab:
           case GDK_KEY_Tab:
-            aud_playlist_set_active (aud_playlist_get_active () ?
-             aud_playlist_get_active () - 1 : aud_playlist_count () - 1);
+            pl_prev ();
             break;
           default:
             return false;
@@ -590,7 +602,7 @@ static gboolean playlist_keypress_cb (GtkWidget * widget, GdkEventKey * event)
             ui_playlist_notebook_position (aud::to_ptr (aud_playlist_get_active ()), nullptr);
             return true;
         case GDK_KEY_Delete:
-            playlist_delete_selected ();
+            pl_remove_selected ();
             return true;
         case GDK_KEY_Menu:
             popup_menu_rclick (0, event->time);
@@ -602,16 +614,16 @@ static gboolean playlist_keypress_cb (GtkWidget * widget, GdkEventKey * event)
         switch (event->keyval)
         {
         case 'x':
-            playlist_cut ();
+            pl_cut ();
             return true;
         case 'c':
-            playlist_copy ();
+            pl_copy ();
             return true;
         case 'v':
-            playlist_paste ();
+            pl_paste ();
             return true;
         case 'a':
-            aud_playlist_select_all (aud_playlist_get_active (), true);
+            pl_select_all ();
             return true;
         }
 
diff --git a/src/gtkui/ui_infoarea.cc b/src/gtkui/ui_infoarea.cc
index 012349f..3125091 100644
--- a/src/gtkui/ui_infoarea.cc
+++ b/src/gtkui/ui_infoarea.cc
@@ -248,7 +248,7 @@ static void get_color (GtkWidget * widget, int i, float * r, float * g, float *
     rgb_to_hsv (c->red / 65535.0, c->green / 65535.0, c->blue / 65535.0, & h, & s, & v);
 
     if (s < 0.1) /* monochrome theme? use blue instead */
-        h = 5;
+        h = 4.6;
 
     s = 1 - 0.9 * i / (VIS_BANDS - 1);
     v = 0.75 + 0.25 * i / (VIS_BANDS - 1);
diff --git a/src/gtkui/ui_playlist_widget.cc b/src/gtkui/ui_playlist_widget.cc
index 6c58192..9307c6f 100644
--- a/src/gtkui/ui_playlist_widget.cc
+++ b/src/gtkui/ui_playlist_widget.cc
@@ -95,7 +95,7 @@ struct PlaylistWidgetData {
 
 static void set_int_from_tuple (GValue * value, const Tuple & tuple, Tuple::Field field)
 {
-    int i = tuple ? tuple.get_int (field) : 0;
+    int i = tuple.get_int (field);
     if (i > 0)
         g_value_take_string (value, g_strdup_printf ("%d", i));
     else
@@ -104,8 +104,7 @@ static void set_int_from_tuple (GValue * value, const Tuple & tuple, Tuple::Fiel
 
 static void set_string_from_tuple (GValue * value, const Tuple & tuple, Tuple::Field field)
 {
-    String str = tuple ? tuple.get_str (field) : String ();
-    g_value_set_string (value, str);
+    g_value_set_string (value, tuple.get_str (field));
 }
 
 static void set_queued (GValue * value, int list, int row)
@@ -150,7 +149,7 @@ static void get_value (void * user, int row, int column, GValue * value)
     case PW_COL_PATH:
     case PW_COL_CUSTOM:
     case PW_COL_BITRATE:
-        tuple = aud_playlist_entry_get_tuple (data->list, row, Playlist::Guess);
+        tuple = aud_playlist_entry_get_tuple (data->list, row, Playlist::NoWait);
         break;
     }
 
@@ -293,10 +292,11 @@ static Index<char> get_data (void * user)
     return audgui_urilist_create_from_selected (playlist);
 }
 
-static void receive_data (void * user, int row, const char * data, int length)
+// length is ignored; GtkSelectionData null-terminates the data for us
+static void receive_data (void * user, int row, const char * data, int /*length*/)
 {
     int playlist = ((PlaylistWidgetData *) user)->list;
-    audgui_urilist_insert (playlist, row, str_copy (data, length));
+    audgui_urilist_insert (playlist, row, data);
 }
 
 static const AudguiListCallbacks callbacks = {
diff --git a/src/hotkey/plugin.cc b/src/hotkey/plugin.cc
index 1ea4a1a..b08975f 100644
--- a/src/hotkey/plugin.cc
+++ b/src/hotkey/plugin.cc
@@ -41,7 +41,6 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
@@ -62,7 +61,8 @@ public:
         N_("Global Hotkeys"),
         PACKAGE,
         about,
-        & hotkey_prefs
+        & hotkey_prefs,
+        PluginGLibOnly
     };
 
     constexpr GlobalHotkeys () : GeneralPlugin (info, false) {}
diff --git a/src/jack-ng/Makefile b/src/jack/Makefile
index f2f5491..f2f5491 100644
--- a/src/jack-ng/Makefile
+++ b/src/jack/Makefile
diff --git a/src/jack-ng/jack-ng.cc b/src/jack/jack-ng.cc
index ed62cbb..242ab9e 100644
--- a/src/jack-ng/jack-ng.cc
+++ b/src/jack/jack-ng.cc
@@ -62,7 +62,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume v);
 
-    bool open_audio (int format, int rate, int channels);
+    bool open_audio (int format, int rate, int channels, String & error);
     void close_audio ();
 
     void period_wait ();
@@ -75,7 +75,7 @@ public:
     void flush ();
 
 private:
-    bool connect_ports (int channels);
+    bool connect_ports (int channels, String & error);
     void generate (jack_nframes_t frames);
 
     static void error_cb (const char * error)
@@ -135,7 +135,7 @@ StereoVolume JACKOutput::get_volume ()
     return {aud_get_int ("jack", "volume_left"), aud_get_int ("jack", "volume_right")};
 }
 
-bool JACKOutput::connect_ports (int channels)
+bool JACKOutput::connect_ports (int channels, String & error)
 {
     bool success = false;
     const char * * ports = nullptr;
@@ -153,7 +153,7 @@ bool JACKOutput::connect_ports (int channels)
 
     if (count < channels)
     {
-        aud_ui_show_error (str_printf (_("Only %d JACK output ports were "
+        error = String (str_printf (_("Only %d JACK output ports were "
          "found but %d are required."), count, channels));
         goto fail;
     }
@@ -169,7 +169,7 @@ bool JACKOutput::connect_ports (int channels)
     {
         if (jack_connect (m_client, jack_port_name (m_ports[i % channels]), ports[i]) != 0)
         {
-            aud_ui_show_error (str_printf (_("Failed to connect to JACK port %s."), ports[i]));
+            error = String (str_printf (_("Failed to connect to JACK port %s."), ports[i]));
             goto fail;
         }
     }
@@ -183,13 +183,13 @@ fail:
     return success;
 }
 
-bool JACKOutput::open_audio (int format, int rate, int channels)
+bool JACKOutput::open_audio (int format, int rate, int channels, String & error)
 {
     int buffer_time;
 
     if (format != FMT_FLOAT)
     {
-        aud_ui_show_error (_("JACK supports only floating-point audio.  You "
+        error = String (_("JACK supports only floating-point audio.  You "
          "must change the output bit depth to floating-point in Audacious "
          "settings."));
         return false;
@@ -202,7 +202,7 @@ bool JACKOutput::open_audio (int format, int rate, int channels)
 
     if (! (m_client = jack_client_open ("audacious", JackNoStartServer, nullptr)))
     {
-        aud_ui_show_error (_("Failed to connect to the JACK server; is it running?"));
+        error = String (_("Failed to connect to the JACK server; is it running?"));
         goto fail;
     }
 
@@ -239,7 +239,7 @@ bool JACKOutput::open_audio (int format, int rate, int channels)
 
     if (aud_get_bool ("jack", "auto_connect"))
     {
-        if (! connect_ports (channels))
+        if (! connect_ports (channels, error))
             goto fail;
     }
 
diff --git a/src/lyricwiki-qt/lyricwiki.cc b/src/lyricwiki-qt/lyricwiki.cc
index a87a100..cf140d2 100644
--- a/src/lyricwiki-qt/lyricwiki.cc
+++ b/src/lyricwiki-qt/lyricwiki.cc
@@ -33,7 +33,6 @@
 #include <libxml/HTMLparser.h>
 #include <libxml/xpath.h>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
@@ -67,7 +66,10 @@ class LyricWikiQt : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("LyricWiki Plugin"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr LyricWikiQt () : GeneralPlugin (info, false) {}
diff --git a/src/lyricwiki/lyricwiki.cc b/src/lyricwiki/lyricwiki.cc
index 3ef5dab..8fa8361 100644
--- a/src/lyricwiki/lyricwiki.cc
+++ b/src/lyricwiki/lyricwiki.cc
@@ -26,7 +26,6 @@
 #include <libxml/HTMLparser.h>
 #include <libxml/xpath.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
@@ -40,7 +39,10 @@ class LyricWiki : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("LyricWiki Plugin"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr LyricWiki () : GeneralPlugin (info, false) {}
diff --git a/src/metronom/metronom.cc b/src/metronom/metronom.cc
index 0effedd..458442f 100644
--- a/src/metronom/metronom.cc
+++ b/src/metronom/metronom.cc
@@ -46,13 +46,11 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo()
-        .with_schemes(schemes);
-
-    constexpr Metronome() : InputPlugin(info, iinfo) {}
+    constexpr Metronome() : InputPlugin(info, InputInfo()
+        .with_schemes(schemes)) {}
 
     bool is_our_file(const char *filename, VFSFile &);
-    Tuple read_tuple(const char *filename, VFSFile &);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
     bool play(const char *filename, VFSFile &);
 };
 
@@ -220,17 +218,16 @@ bool Metronome::play (const char * filename, VFSFile &)
     return true;
 }
 
-Tuple Metronome::read_tuple(const char *filename, VFSFile &)
+bool Metronome::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-    Tuple tuple;
     metronom_t metronom;
     String desc;
 
-    tuple.set_filename (filename);
-    if (metronom_get_cp(filename, &metronom, desc))
-        tuple.set_str (Tuple::Title, desc);
+    if (!metronom_get_cp(filename, &metronom, desc))
+        return false;
 
-    return tuple;
+    tuple.set_str(Tuple::Title, desc);
+    return true;
 }
 
 const char Metronome::about[] =
diff --git a/src/modplug/modplugbmp.cc b/src/modplug/modplugbmp.cc
index 8fd269c..338f92a 100644
--- a/src/modplug/modplugbmp.cc
+++ b/src/modplug/modplugbmp.cc
@@ -273,10 +273,6 @@ bool ModplugXMMS::play (const char * filename, VFSFile & file)
         mArchive->Size()
     );
 
-    Tuple ti = read_tuple (filename, file);
-    if (ti)
-        set_playback_tuple (std::move (ti));
-
     set_stream_bitrate(mSoundFile->GetNumChannels() * 1000);
 
     int fmt = (mModProps.mBits == 16) ? FMT_S16_NE : FMT_U8;
@@ -294,7 +290,8 @@ bool ModplugXMMS::play (const char * filename, VFSFile & file)
     return true;
 }
 
-Tuple ModplugXMMS::read_tuple (const char * filename, VFSFile & file)
+bool ModplugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
     CSoundFile* lSoundFile;
     Archive* lArchive;
@@ -305,12 +302,9 @@ Tuple ModplugXMMS::read_tuple (const char * filename, VFSFile & file)
     if(lArchive->Size() == 0)
     {
         delete lArchive;
-        return Tuple ();
+        return false;
     }
 
-    Tuple ti;
-    ti.set_filename (filename);
-
     lSoundFile = new CSoundFile;
     lSoundFile->Create((unsigned char*)lArchive->Map(), lArchive->Size());
 
@@ -339,22 +333,22 @@ Tuple ModplugXMMS::read_tuple (const char * filename, VFSFile & file)
     case MOD_TYPE_PSM:  tmps = "Protracker Studio Module"; break;
     default:        tmps = "ModPlug unknown"; break;
     }
-    ti.set_str (Tuple::Codec, tmps);
-    ti.set_str (Tuple::Quality, _("sequenced"));
-    ti.set_int (Tuple::Length, lSoundFile->GetSongTime() * 1000);
+    tuple.set_str (Tuple::Codec, tmps);
+    tuple.set_str (Tuple::Quality, _("sequenced"));
+    tuple.set_int (Tuple::Length, lSoundFile->GetSongTime() * 1000);
 
     const char *tmps2 = lSoundFile->GetTitle();
     // Chop any leading spaces off. They are annoying in the playlist.
     while (tmps2[0] == ' ')
         tmps2++;
     if (tmps2[0])
-        ti.set_str(Tuple::Title, tmps2);
+        tuple.set_str(Tuple::Title, tmps2);
 
     //unload the file
     lSoundFile->Destroy();
     delete lSoundFile;
     delete lArchive;
-    return ti;
+    return true;
 }
 
 void ModplugXMMS::apply_settings ()
diff --git a/src/modplug/modplugbmp.h b/src/modplug/modplugbmp.h
index e2c4d3c..6ecfeb1 100644
--- a/src/modplug/modplugbmp.h
+++ b/src/modplug/modplugbmp.h
@@ -60,15 +60,13 @@ public:
         & prefs
     };
 
-    static constexpr auto iinfo = InputInfo (FlagSubtunes)
-        .with_exts (exts);
-
-    constexpr ModplugXMMS () : InputPlugin (info, iinfo) {}
+    constexpr ModplugXMMS () : InputPlugin (info, InputInfo (FlagSubtunes)
+        .with_exts (exts)) {}
 
     bool init ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 
 private:
diff --git a/src/mpg123/mpg123.cc b/src/mpg123/mpg123.cc
index 2855356..874574c 100644
--- a/src/mpg123/mpg123.cc
+++ b/src/mpg123/mpg123.cc
@@ -57,16 +57,14 @@ public:
         & prefs
     };
 
-    static constexpr auto iinfo = InputInfo (FlagWritesTag)
-        .with_exts (exts);
-
-    constexpr MPG123Plugin() : InputPlugin (info, iinfo) {}
+    constexpr MPG123Plugin() : InputPlugin (info, InputInfo (FlagWritesTag)
+        .with_exts (exts)) {}
 
     bool init ();
     void cleanup ();
 
     bool is_our_file (const char * filename, VFSFile & file);
-    bool read_tag (const char * filename, VFSFile & file, Tuple * tuple, Index<char> * image);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
     bool play (const char * filename, VFSFile & file);
 };
@@ -88,6 +86,10 @@ const PluginPreferences MPG123Plugin::prefs = {{widgets}};
 
 #define DECODE_OPTIONS (MPG123_QUIET | MPG123_GAPLESS | MPG123_SEEKBUFFER | MPG123_FUZZY)
 
+// this is a macro so that the printed line number is meaningful
+#define print_mpg123_error(filename, decoder) \
+    AUDERR ("mpg123 error in %s: %s\n", filename, mpg123_strerror (decoder))
+
 static ssize_t replace_read (void * file, void * buffer, size_t length)
 {
     return ((VFSFile *) file)->fread (buffer, 1, length);
@@ -258,33 +260,26 @@ static bool read_mpg123_info (const char * filename, VFSFile & file, Tuple & tup
     return true;
 }
 
-bool MPG123Plugin::read_tag (const char * filename, VFSFile & file, Tuple * tuple, Index<char> * image)
+bool MPG123Plugin::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image)
 {
     bool stream = (file.fsize () < 0);
 
-    if (tuple)
-    {
-        if (! read_mpg123_info (filename, file, * tuple))
-            return false;
-
-        if (stream)
-            tuple->fetch_stream_info (file);
+    if (! read_mpg123_info (filename, file, tuple))
+        return false;
 
-        if (! stream && file.fseek (0, VFS_SEEK_SET) != 0)
+    if (stream)
+        tuple.fetch_stream_info (file);
+    else
+    {
+        if (file.fseek (0, VFS_SEEK_SET) != 0)
             return false;
-    }
 
-    if (! stream)
         audtag::read_tag (file, tuple, image);
+    }
 
     return true;
 }
 
-static void print_mpg123_error (const char * filename, mpg123_handle * decoder)
-{
-    AUDERR ("mpg123 error in %s: %s\n", filename, mpg123_strerror (decoder));
-}
-
 bool MPG123Plugin::play (const char * filename, VFSFile & file)
 {
     bool stream = (file.fsize () < 0);
@@ -293,7 +288,7 @@ bool MPG123Plugin::play (const char * filename, VFSFile & file)
     if (stream)
     {
         tuple = get_playback_tuple ();
-        if (detect_id3 (file) && audtag::read_tag (file, & tuple, nullptr))
+        if (detect_id3 (file) && audtag::read_tag (file, tuple, nullptr))
             set_playback_tuple (tuple.ref ());
     }
 
@@ -307,7 +302,7 @@ bool MPG123Plugin::play (const char * filename, VFSFile & file)
 
     set_stream_bitrate (bitrate);
 
-    if (tuple && tuple.fetch_stream_info (file))
+    if (stream && tuple.fetch_stream_info (file))
         set_playback_tuple (tuple.ref ());
 
     open_audio (FMT_FLOAT, s.rate, s.channels);
@@ -336,7 +331,7 @@ bool MPG123Plugin::play (const char * filename, VFSFile & file)
             bitrate_count = 0;
         }
 
-        if (tuple && tuple.fetch_stream_info (file))
+        if (stream && tuple.fetch_stream_info (file))
             set_playback_tuple (tuple.ref ());
 
         if (! s.bytes_read)
@@ -348,10 +343,15 @@ bool MPG123Plugin::play (const char * filename, VFSFile & file)
 
             if (ret < 0)
             {
-                print_mpg123_error (filename, s.dec);
+                // log only the first error
+                if (! error_count)
+                    print_mpg123_error (filename, s.dec);
 
+                // generally unreported errors are bad, but due to the number of
+                // MP3s with junk data at the end, RESYNC_FAIL just becomes a
+                // nuisance, so silence it
                 if (++ error_count >= 10)
-                    return false;
+                    return (mpg123_errcode (s.dec) == MPG123_RESYNC_FAIL);
             }
         }
 
@@ -372,7 +372,7 @@ bool MPG123Plugin::write_tuple (const char * filename, VFSFile & file, const Tup
     if (file.fsize () < 0)  // stream?
         return false;
 
-    return audtag::tuple_write (tuple, file, audtag::TagType::ID3v2);
+    return audtag::write_tuple (file, tuple, audtag::TagType::ID3v2);
 }
 
 const char * const MPG123Plugin::exts[] = { "mp3", "mp2", "mp1", "bmu", nullptr };
diff --git a/src/neon/neon.cc b/src/neon/neon.cc
index 092809e..6cddac0 100644
--- a/src/neon/neon.cc
+++ b/src/neon/neon.cc
@@ -130,7 +130,7 @@ public:
     NeonFile (const char * url);
     ~NeonFile ();
 
-    int open_handle (uint64_t startbyte, String * error = nullptr);
+    int open_handle (int64_t startbyte, String * error = nullptr);
 
 protected:
     int64_t fread (void * ptr, int64_t size, int64_t nmemb);
@@ -151,11 +151,14 @@ private:
     ne_uri m_purl = ne_uri ();  /* The URL, parsed into a structure */
 
     unsigned char m_redircount = 0;     /* Redirect count for the opened URL */
-    long m_pos = 0;                     /* Current position in the stream (number of last byte delivered to the player) */
-    unsigned long m_content_start = 0;  /* Start position in the stream */
-    long m_content_length = -1;         /* Total content length, counting from content_start, if known. -1 if unknown */
+    int64_t m_pos = 0;                  /* Current position in the stream
+                                           (number of last byte delivered to the player) */
+    int64_t m_content_start = 0;        /* Start position in the stream */
+    int64_t m_content_length = -1;      /* Total content length, counting from
+                                           content_start, if known. -1 if unknown */
     bool m_can_ranges = false;          /* true if the webserver advertised accept-range: bytes */
-    int64_t m_icy_metaint = 0;          /* Interval in which the server will send metadata announcements. 0 if no announcments */
+    int64_t m_icy_metaint = 0;          /* Interval in which the server will
+                                           send metadata announcements. 0 if no announcments */
     int64_t m_icy_metaleft = 0;         /* Bytes left until the next metadata block */
     int m_icy_len = 0;                  /* Bytes in current metadata block */
 
@@ -174,7 +177,7 @@ private:
     void kill_reader ();
     int server_auth (const char * realm, int attempt, char * username, char * password);
     void handle_headers ();
-    int open_request (uint64_t startbyte, String * error);
+    int open_request (int64_t startbyte, String * error);
     FillBufferResult fill_buffer ();
     void reader ();
     int64_t try_fread (void * ptr, int64_t size, int64_t nmemb, bool & data_read);
@@ -380,12 +383,12 @@ void NeonFile::handle_headers ()
         {
             /* The server sent us the content length. Parse and store. */
             char * endptr;
-            long len = strtol (value, & endptr, 10);
+            int64_t len = strtoll (value, & endptr, 10);
 
             if (value[0] && ! endptr[0] && len >= 0)
             {
                 /* Valid data. */
-                AUDDBG ("Content length as advertised by server: %ld\n", len);
+                AUDDBG ("Content length as advertised by server: %" PRId64 "\n", len);
                 m_content_length = len;
             }
             else
@@ -401,12 +404,12 @@ void NeonFile::handle_headers ()
         {
             /* The server sent us a ICY metaint header. Parse and store. */
             char * endptr;
-            long len = strtol (value, & endptr, 10);
+            int64_t len = strtoll (value, & endptr, 10);
 
             if (value[0] && ! endptr[0] && len > 0)
             {
                 /* Valid data */
-                AUDDBG ("ICY MetaInt as advertised by server: %ld\n", len);
+                AUDDBG ("ICY MetaInt as advertised by server: %" PRId64 "\n", len);
                 m_icy_metaint = len;
                 m_icy_metaleft = len;
             }
@@ -440,7 +443,7 @@ static int neon_proxy_auth_cb (void * userdata, const char * realm, int attempt,
     return attempt;
 }
 
-int NeonFile::open_request (uint64_t startbyte, String * error)
+int NeonFile::open_request (int64_t startbyte, String * error)
 {
     int ret;
     const ne_status * status;
@@ -546,7 +549,7 @@ int NeonFile::open_request (uint64_t startbyte, String * error)
     return -1;
 }
 
-int NeonFile::open_handle (uint64_t startbyte, String * error)
+int NeonFile::open_handle (int64_t startbyte, String * error)
 {
     int ret;
     String proxy_host;
@@ -957,7 +960,7 @@ int64_t NeonFile::fwrite (const void * ptr, int64_t size, int64_t nmemb)
 
 int64_t NeonFile::ftell ()
 {
-    AUDDBG ("<%p> Current file position: %ld\n", this, m_pos);
+    AUDDBG ("<%p> Current file position: %" PRId64 "\n", this, m_pos);
 
     return m_pos;
 }
@@ -983,7 +986,7 @@ int NeonFile::fflush ()
 
 int NeonFile::fseek (int64_t offset, VFSSeekType whence)
 {
-    AUDDBG ("<%p> Seek requested: offset %ld, whence %d\n", this, offset, whence);
+    AUDDBG ("<%p> Seek requested: offset %" PRId64 ", whence %d\n", this, offset, whence);
 
     /* To seek to a non-zero offset, two things must be satisfied:
      * - the server must advertise a content-length
@@ -1023,7 +1026,7 @@ int NeonFile::fseek (int64_t offset, VFSSeekType whence)
         return -1;
     }
 
-    AUDDBG ("<%p> Position to seek to: %ld, current: %ld\n", this, newpos, m_pos);
+    AUDDBG ("<%p> Position to seek to: %" PRId64 ", current: %" PRId64 "\n", this, newpos, m_pos);
 
     if (newpos < 0)
     {
@@ -1033,8 +1036,8 @@ int NeonFile::fseek (int64_t offset, VFSSeekType whence)
 
     if (newpos && newpos >= content_length)
     {
-        AUDERR ("<%p> Can not seek beyond end of stream (%ld >= %ld)\n",
-         this, (long) newpos, (long) content_length);
+        AUDERR ("<%p> Can not seek beyond end of stream (%" PRId64 " >= %"
+         PRId64 "\n", this, newpos, content_length);
         return -1;
     }
 
diff --git a/src/notify/Makefile b/src/notify/Makefile
index 82f1476..a7820e4 100644
--- a/src/notify/Makefile
+++ b/src/notify/Makefile
@@ -9,6 +9,16 @@ plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 LD = ${CXX}
 
-CPPFLAGS += -I../.. ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${NOTIFY_CFLAGS}
+CPPFLAGS += -I../.. ${PLUGIN_CPPFLAGS} ${NOTIFY_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${NOTIFY_LIBS} -laudgui
+LIBS += ${NOTIFY_LIBS}
+
+ifeq ($(USE_GTK),yes)
+CPPFLAGS += ${GTK_CFLAGS}
+LIBS += ${GTK_LIBS} -laudgui
+endif
+
+ifeq ($(USE_QT),yes)
+CPPFLAGS += ${QT_CFLAGS}
+LIBS += ${QT_LIBS} -laudqt
+endif
diff --git a/src/notify/event.cc b/src/notify/event.cc
index f00f0d2..8f3a323 100644
--- a/src/notify/event.cc
+++ b/src/notify/event.cc
@@ -19,19 +19,29 @@
  */
 
 #include "event.h"
+#include "osd.h"
 
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
-#include <libaudgui/libaudgui-gtk.h>
 
-#include "osd.h"
+#ifdef USE_GTK
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+#endif
+#ifdef USE_QT
+#include <libaudqt/libaudqt.h>
+#endif
 
 static String last_title, last_message;
 static GdkPixbuf * last_pixbuf = nullptr;
 
+#ifdef USE_QT
+static QImage qimage;
+#endif
+
 static void clear_cache ()
 {
     last_title = String ();
@@ -43,20 +53,41 @@ static void clear_cache ()
         last_pixbuf = nullptr;
     }
 
+#ifdef USE_QT
+    qimage = QImage ();
+#endif
+
     osd_hide ();
 }
 
-static bool get_album_art ()
+static void get_album_art ()
 {
     if (last_pixbuf)
-        return false;
-
-    last_pixbuf = audgui_pixbuf_request_current ();
-    if (! last_pixbuf)
-        return false;
+        return;
 
-    audgui_pixbuf_scale_within (& last_pixbuf, audgui_get_dpi ());
-    return true;
+#ifdef USE_GTK
+    if (aud_get_mainloop_type () == MainloopType::GLib)
+    {
+        last_pixbuf = audgui_pixbuf_request_current ();
+        if (last_pixbuf)
+            audgui_pixbuf_scale_within (& last_pixbuf, audgui_get_dpi ());
+    }
+#endif
+#ifdef USE_QT
+    if (aud_get_mainloop_type () == MainloopType::Qt)
+    {
+        QImage image = audqt::art_request_current (96, 96, false).toImage ();
+        if (! image.isNull ())
+            qimage = image.convertToFormat (QImage::Format_RGBA8888);
+
+        // convert QImage to GdkPixbuf.
+        // note that the GdkPixbuf shares the same internal image data.
+        if (! qimage.isNull ())
+            last_pixbuf = gdk_pixbuf_new_from_data (qimage.bits (),
+             GDK_COLORSPACE_RGB, true, 8, qimage.width (), qimage.height (),
+             qimage.bytesPerLine (), nullptr, nullptr);
+    }
+#endif
 }
 
 static void show_stopped ()
@@ -124,6 +155,15 @@ static void force_show ()
 
 void event_init ()
 {
+#ifdef USE_GTK
+    if (aud_get_mainloop_type () == MainloopType::GLib)
+        audgui_init ();
+#endif
+#ifdef USE_QT
+    if (aud_get_mainloop_type () == MainloopType::Qt)
+        audqt::init ();
+#endif
+
     if (aud_drct_get_ready ())
         playback_update ();
     else
@@ -151,4 +191,13 @@ void event_uninit ()
     hook_dissociate ("aosd toggle", (HookFunction) force_show);
 
     clear_cache ();
+
+#ifdef USE_GTK
+    if (aud_get_mainloop_type () == MainloopType::GLib)
+        audgui_cleanup ();
+#endif
+#ifdef USE_QT
+    if (aud_get_mainloop_type () == MainloopType::Qt)
+        audqt::cleanup ();
+#endif
 }
diff --git a/src/notify/notify.cc b/src/notify/notify.cc
index 4a982d1..9ad10a6 100644
--- a/src/notify/notify.cc
+++ b/src/notify/notify.cc
@@ -18,16 +18,12 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtk.h>
-
 #include <libnotify/notify.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
-#include <libaudgui/libaudgui.h>
 
 #include "event.h"
 
@@ -86,7 +82,6 @@ bool NotifyPlugin::init ()
     if (! notify_init ("Audacious"))
         return false;
 
-    audgui_init ();
     event_init ();
     return true;
 }
@@ -94,7 +89,6 @@ bool NotifyPlugin::init ()
 void NotifyPlugin::cleanup ()
 {
     event_uninit ();
-    audgui_cleanup ();
     notify_uninit ();
 }
 
diff --git a/src/oss4/oss.cc b/src/oss4/oss.cc
index 6c1a8dc..2c2bc33 100644
--- a/src/oss4/oss.cc
+++ b/src/oss4/oss.cc
@@ -54,7 +54,7 @@ bool OSSPlugin::init()
     return oss_hardware_present();
 }
 
-bool OSSPlugin::set_format(int format, int rate, int channels)
+bool OSSPlugin::set_format(int format, int rate, int channels, String &error)
 {
     int param;
 
@@ -69,17 +69,31 @@ bool OSSPlugin::set_format(int format, int rate, int channels)
 #endif
 
     param = format;
-    CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SETFMT, &param);
-    CHECK_VAL(param == format, ERROR_NOISY, "Selected audio format is not supported by the device.\n");
+    CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SETFMT, &param);
+
+    if (param != format)
+    {
+        error = String("Selected audio format is not supported by the device.");
+        goto FAILED;
+    }
 
     param = rate;
-    CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SPEED, &param);
-    CHECK_VAL(param >= rate * 9 / 10 && param <= rate * 11 / 10, ERROR_NOISY,
-     "Selected sample rate is not supported by the device.\n");
+    CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SPEED, &param);
+
+    if (param < rate * 9 / 10 || param > rate * 11 / 10)
+    {
+        error = String("Selected sample rate is not supported by the device.");
+        goto FAILED;
+    }
 
     param = channels;
-    CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_CHANNELS, &param);
-    CHECK_VAL(param == channels, ERROR_NOISY, "Selected number of channels is not supported by the device.\n");
+    CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_CHANNELS, &param);
+
+    if (param != channels)
+    {
+        error = String("Selected number of channels is not supported by the device.");
+        goto FAILED;
+    }
 
     m_format = format;
     m_rate = rate;
@@ -102,7 +116,7 @@ static int log2(int x)
     return y;
 }
 
-bool OSSPlugin::set_buffer()
+bool OSSPlugin::set_buffer(String &error)
 {
     int milliseconds = aud_get_int(nullptr, "output_buffer_size");
     int bytes = frames_to_bytes(aud::rescale(milliseconds, 1000, m_rate));
@@ -110,7 +124,7 @@ bool OSSPlugin::set_buffer()
     int numfrags = aud::clamp(aud::rdiv(bytes, 1 << fragorder), 4, 32767);
 
     int param = (numfrags << 16) | fragorder;
-    CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SETFRAGMENT, &param);
+    CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SETFRAGMENT, &param);
 
     return true;
 
@@ -200,7 +214,7 @@ static void poll_cleanup()
     close(poll_pipe[1]);
 }
 
-bool OSSPlugin::open_audio(int aud_format, int rate, int channels)
+bool OSSPlugin::open_audio(int aud_format, int rate, int channels, String &error)
 {
     AUDDBG("Opening audio.\n");
 
@@ -208,23 +222,27 @@ bool OSSPlugin::open_audio(int aud_format, int rate, int channels)
     audio_buf_info buf_info;
     bool poll_was_setup = false;
 
-    CHECK_NOISY(m_fd = open_device);
+    CHECK_STR(error, m_fd = open_device);
 
     if (poll_setup(m_fd))
         poll_was_setup = true;
     else
         goto FAILED;
 
-    format = oss_convert_aud_format(aud_format);
+    if ((format = oss_convert_aud_format(aud_format)) < 0)
+    {
+        error = String("Unsupported audio format");
+        goto FAILED;
+    }
 
-    if (!set_format(format, rate, channels))
+    if (!set_format(format, rate, channels, error))
         goto FAILED;
 
-    if (!set_buffer())
+    if (!set_buffer(error))
         goto FAILED;
 
     memset(&buf_info, 0, sizeof buf_info);
-    CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_GETOSPACE, &buf_info);
+    CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_GETOSPACE, &buf_info);
 
     AUDINFO("Buffer information, fragstotal: %d, fragsize: %d, bytes: %d.\n",
         buf_info.fragstotal,
diff --git a/src/oss4/oss.h b/src/oss4/oss.h
index aff7bb6..11de4af 100644
--- a/src/oss4/oss.h
+++ b/src/oss4/oss.h
@@ -34,43 +34,25 @@
 #endif
 
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#define ERROR AUDERR
-
-#define ERROR_NOISY(...) \
-do { \
-    aud_ui_show_error(str_printf("OSS4 error: " __VA_ARGS__)); \
-    ERROR(__VA_ARGS__); \
-} while (0) \
-
-#define DESCRIBE_ERROR ERROR("%s\n", oss_describe_error())
-#define DESCRIBE_ERROR_NOISY ERROR_NOISY("%s\n", oss_describe_error())
+#define DESCRIBE_ERROR AUDERR("%s\n", oss_describe_error())
 
 #define CHECK(function, ...) \
 do { \
-    int error = function(__VA_ARGS__); \
-    if (error < 0) { \
+    int CHECK_error = function(__VA_ARGS__); \
+    if (CHECK_error < 0) { \
         DESCRIBE_ERROR; \
         goto FAILED; \
     } \
 } while (0)
 
-#define CHECK_NOISY(function, ...) \
-do { \
-    int error = function(__VA_ARGS__); \
-    if (error < 0) { \
-        DESCRIBE_ERROR_NOISY; \
-        goto FAILED; \
-    } \
-} while (0)
-
-#define CHECK_VAL(value, function, ...) \
+#define CHECK_STR(str, function, ...) \
 do { \
-    if (!(value)) { \
-        function(__VA_ARGS__); \
+    int CHECK_STR_error = function(__VA_ARGS__); \
+    if (CHECK_STR_error < 0) { \
+        str = String(str_printf("OSS error: %s\n", oss_describe_error())); \
         goto FAILED; \
     } \
 } while (0)
@@ -112,7 +94,7 @@ public:
     StereoVolume get_volume();
     void set_volume(StereoVolume v);
 
-    bool open_audio(int aud_format, int rate, int chans);
+    bool open_audio(int aud_format, int rate, int chans, String &error);
     void close_audio();
 
     void period_wait();
@@ -125,8 +107,8 @@ public:
     void flush();
 
 private:
-    bool set_format(int format, int rate, int channels);
-    bool set_buffer();
+    bool set_format(int format, int rate, int channels, String &error);
+    bool set_buffer(String &error);
 
     int frames_to_bytes(int frames) const
         { return frames * (m_bytes_per_sample * m_channels); }
diff --git a/src/oss4/plugin.cc b/src/oss4/plugin.cc
index c710b43..6cbfa22 100644
--- a/src/oss4/plugin.cc
+++ b/src/oss4/plugin.cc
@@ -30,7 +30,7 @@ static void combo_init()
 {
     int mixerfd;
 
-    CHECK_NOISY(mixerfd = open, DEFAULT_MIXER, O_RDWR);
+    CHECK(mixerfd = open, DEFAULT_MIXER, O_RDWR);
 
     oss_elements.append(ComboItem(strdup(N_("Default device")), strdup(DEFAULT_DSP)));
 
@@ -38,7 +38,7 @@ static void combo_init()
     oss_sysinfo sysinfo;
     memset(&sysinfo, 0, sizeof sysinfo);
     CHECK(ioctl, mixerfd, SNDCTL_SYSINFO, &sysinfo);
-    CHECK_NOISY(oss_probe_for_adev, &sysinfo);
+    CHECK(oss_probe_for_adev, &sysinfo);
 
     for (int i = 0; i < sysinfo.numaudios; i++)
     {
diff --git a/src/oss4/utils.cc b/src/oss4/utils.cc
index 35f6e67..25db313 100644
--- a/src/oss4/utils.cc
+++ b/src/oss4/utils.cc
@@ -186,13 +186,13 @@ bool oss_hardware_present()
 {
     int mixerfd;
 
-    CHECK_NOISY(mixerfd = open, DEFAULT_MIXER, O_RDWR, 0);
+    CHECK(mixerfd = open, DEFAULT_MIXER, O_RDWR, 0);
 
 #ifdef SNDCTL_SYSINFO
     oss_sysinfo sysinfo;
     memset(&sysinfo, 0, sizeof sysinfo);
     CHECK(ioctl, mixerfd, SNDCTL_SYSINFO, &sysinfo);
-    CHECK_NOISY(oss_probe_for_adev, &sysinfo);
+    CHECK(oss_probe_for_adev, &sysinfo);
 #endif
 
     close(mixerfd);
diff --git a/src/playlist-manager-qt/playlist-manager-qt.cc b/src/playlist-manager-qt/playlist-manager-qt.cc
index 17907e6..cf779ca 100644
--- a/src/playlist-manager-qt/playlist-manager-qt.cc
+++ b/src/playlist-manager-qt/playlist-manager-qt.cc
@@ -27,7 +27,6 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/playlist.h>
@@ -39,7 +38,10 @@ class PlaylistManagerQt : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Playlist Manager"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr PlaylistManagerQt () : GeneralPlugin (info, false) {}
diff --git a/src/playlist-manager/playlist-manager.cc b/src/playlist-manager/playlist-manager.cc
index 9c46a25..bb5f0d0 100644
--- a/src/playlist-manager/playlist-manager.cc
+++ b/src/playlist-manager/playlist-manager.cc
@@ -17,7 +17,6 @@
  * the use of this software.
  */
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
@@ -36,7 +35,10 @@ class PlaylistManager : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Playlist Manager"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr PlaylistManager () : GeneralPlugin (info, false) {}
diff --git a/src/psf/peops/reverb.cc b/src/psf/peops/reverb.cc
index 681d56c..1354444 100644
--- a/src/psf/peops/reverb.cc
+++ b/src/psf/peops/reverb.cc
@@ -81,7 +81,8 @@ static inline void s_buffer1(int iOff,int iVal)                // set_buffer (+1
  iOff=(iOff*4)+rvb.CurrAddr+1;
  while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
  while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ if(iVal<-32768L) iVal=-32768L;
+ if(iVal>32767L) iVal=32767L;
  *(p+iOff)=(s16)BFLIP16((s16)iVal);
 }
 
diff --git a/src/psf/peops/spu.cc b/src/psf/peops/spu.cc
index 1e79cbc..1ebfce6 100644
--- a/src/psf/peops/spu.cc
+++ b/src/psf/peops/spu.cc
@@ -193,7 +193,7 @@ static u32 seektime;
 int psf_seek(u32 t)
 {
  seektime=t*441/10;
- if(seektime>sampcount) return(1);
+ if(seektime>=sampcount) return(1);
  return(0);
 }
 
@@ -493,8 +493,10 @@ int SPUasync(u32 cycles, void (*update)(const void *, int))
   // if(sr>32767 || sr < -32767) printf("Right: %d, %f\n",sl,asl);
   //}
 
-  if(sl>32767) sl=32767; if(sl<-32767) sl=-32767;
-  if(sr>32767) sr=32767; if(sr<-32767) sr=-32767;
+  if(sl>32767) sl=32767;
+  if(sl<-32767) sl=-32767;
+  if(sr>32767) sr=32767;
+  if(sr<-32767) sr=-32767;
 
   *pS++=sl;
   *pS++=sr;
@@ -560,6 +562,7 @@ int SPUinit(void)
  memset(spuMem,0,sizeof(spuMem));
  InitADSR();
  sampcount=ttemp=0;
+ seektime=0;
  #ifdef TIMEO
  begintime=gettime64();
  #endif
diff --git a/src/psf/peops2/reverb.cc b/src/psf/peops2/reverb.cc
index 068dc95..cd20260 100644
--- a/src/psf/peops2/reverb.cc
+++ b/src/psf/peops2/reverb.cc
@@ -122,7 +122,8 @@ static inline void s_buffer(int iOff,int iVal,int core)        // set_buffer con
  iOff=(iOff)+rvb[core].CurrAddr;

  while(iOff>rvb[core].EndAddr) iOff=rvb[core].StartAddr+(iOff-(rvb[core].EndAddr+1));

  while(iOff<rvb[core].StartAddr) iOff=rvb[core].EndAddr-(rvb[core].StartAddr-iOff);

- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;

+ if(iVal<-32768L) iVal=-32768L;

+ if(iVal>32767L) iVal=32767L;

  *(p+iOff)=(short)iVal;

 }

 

@@ -134,7 +135,8 @@ static inline void s_buffer1(int iOff,int iVal,int core)      // set_buffer (+1
  iOff=(iOff)+rvb[core].CurrAddr+1;

  while(iOff>rvb[core].EndAddr) iOff=rvb[core].StartAddr+(iOff-(rvb[core].EndAddr+1));

  while(iOff<rvb[core].StartAddr) iOff=rvb[core].EndAddr-(rvb[core].StartAddr-iOff);

- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;

+ if(iVal<-32768L) iVal=-32768L;

+ if(iVal>32767L) iVal=32767L;

  *(p+iOff)=(short)iVal;

 }

 

diff --git a/src/psf/peops2/spu.cc b/src/psf/peops2/spu.cc
index b5d0b3b..4585512 100644
--- a/src/psf/peops2/spu.cc
+++ b/src/psf/peops2/spu.cc
@@ -332,14 +332,13 @@ static u32 seektime;
 int psf2_seek(u32 t)
 {
  seektime=t*441/10;
- if(seektime>sampcount) return(1);
+ if(seektime>=sampcount) return(1);
  return(0);
 }
 
 // Counting to 65536 results in full volume offage.
 void setlength2(s32 stop, s32 fade)
 {
- seektime = 0;
  if(stop==~0)
  {
   decaybegin=~0;
@@ -735,8 +734,10 @@ ENDX:   ;
     d=SSumL[0];SSumL[0]=0;
     d2=SSumR[0];SSumR[0]=0;
 
-    if(d<-32767) d=-32767;if(d>32767) d=32767;
-    if(d2<-32767) d2=-32767;if(d2>32767) d2=32767;
+    if(d<-32767) d=-32767;
+    if(d>32767) d=32767;
+    if(d2<-32767) d2=-32767;
+    if(d2>32767) d2=32767;
 
     if(sampcount>=decaybegin)
      {
@@ -833,6 +834,7 @@ EXPORT_GCC long CALLBACK SPU2init(void)
  memset(rvb,0,2*sizeof(REVERBInfo));
 
  sampcount = 0;
+ seektime = 0;
 
  InitADSR();
 
diff --git a/src/psf/plugin.cc b/src/psf/plugin.cc
index 1975d76..e512140 100644
--- a/src/psf/plugin.cc
+++ b/src/psf/plugin.cc
@@ -1,27 +1,27 @@
 /*
-	Audio Overload SDK - main driver.  for demonstration only, not user friendly!
+    Audio Overload SDK - main driver.  for demonstration only, not user friendly!
 
-	Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+    Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
 
-	All rights reserved.
+    All rights reserved.
 
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+    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.
+    * 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.
+    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.
 */
 
 #include <stdio.h>
@@ -39,48 +39,46 @@
 class PSFPlugin : public InputPlugin
 {
 public:
-	static const char *const exts[];
+    static const char *const exts[];
 
-	static constexpr PluginInfo info = {
-		N_("OpenPSF PSF1/PSF2 Decoder"),
-		PACKAGE
-	};
+    static constexpr PluginInfo info = {
+        N_("OpenPSF PSF1/PSF2 Decoder"),
+        PACKAGE
+    };
 
-	static constexpr auto iinfo = InputInfo()
-		.with_exts(exts);
+    constexpr PSFPlugin() : InputPlugin(info, InputInfo()
+        .with_exts(exts)) {}
 
-	constexpr PSFPlugin() : InputPlugin(info, iinfo) {}
-
-	bool is_our_file(const char *filename, VFSFile &file);
-	Tuple read_tuple(const char *filename, VFSFile &file);
-	bool play(const char *filename, VFSFile &file);
+    bool is_our_file(const char *filename, VFSFile &file);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
+    bool play(const char *filename, VFSFile &file);
 
 protected:
-	static void update(const void *data, int bytes);
+    static void update(const void *data, int bytes);
 };
 
 EXPORT PSFPlugin aud_plugin_instance;
 
 typedef enum {
-	ENG_NONE = 0,
-	ENG_PSF1,
-	ENG_PSF2,
-	ENG_SPX,
-	ENG_COUNT
+    ENG_NONE = 0,
+    ENG_PSF1,
+    ENG_PSF2,
+    ENG_SPX,
+    ENG_COUNT
 } PSFEngine;
 
 typedef struct {
-	int32_t (*start)(uint8_t *buffer, uint32_t length);
-	int32_t (*stop)(void);
-	int32_t (*seek)(uint32_t);
-	int32_t (*execute)(void (*update)(const void *, int));
+    int32_t (*start)(uint8_t *buffer, uint32_t length);
+    int32_t (*stop)(void);
+    int32_t (*seek)(uint32_t);
+    int32_t (*execute)(void (*update)(const void *, int));
 } PSFEngineFunctors;
 
 static PSFEngineFunctors psf_functor_map[ENG_COUNT] = {
-	{nullptr, nullptr, nullptr, nullptr},
-	{psf_start, psf_stop, psf_seek, psf_execute},
-	{psf2_start, psf2_stop, psf2_seek, psf2_execute},
-	{spx_start, spx_stop, psf_seek, spx_execute},
+    {nullptr, nullptr, nullptr, nullptr},
+    {psf_start, psf_stop, psf_seek, psf_execute},
+    {psf2_start, psf2_stop, psf2_seek, psf2_execute},
+    {spx_start, spx_stop, psf_seek, spx_execute},
 };
 
 static PSFEngineFunctors *f;
@@ -88,128 +86,148 @@ static String dirpath;
 
 bool stop_flag = false;
 
+/* The emulation engine can only seek forward, not back.  This variable is set
+ * a non-negative time (milliseconds) when the song is to be restarted in order
+ * to seek backward. */
+static int reverse_seek;
+
 static PSFEngine psf_probe(const char *buf, int len)
 {
-	if (len < 4)
-		return ENG_NONE;
+    if (len < 4)
+        return ENG_NONE;
 
-	if (!memcmp(buf, "PSF\x01", 4))
-		return ENG_PSF1;
+    if (!memcmp(buf, "PSF\x01", 4))
+        return ENG_PSF1;
 
-	if (!memcmp(buf, "PSF\x02", 4))
-		return ENG_PSF2;
+    if (!memcmp(buf, "PSF\x02", 4))
+        return ENG_PSF2;
 
-	if (!memcmp(buf, "SPU", 3))
-		return ENG_SPX;
+    if (!memcmp(buf, "SPU", 3))
+        return ENG_SPX;
 
-	if (!memcmp(buf, "SPX", 3))
-		return ENG_SPX;
+    if (!memcmp(buf, "SPX", 3))
+        return ENG_SPX;
 
-	return ENG_NONE;
+    return ENG_NONE;
 }
 
 /* ao_get_lib: called to load secondary files */
 Index<char> ao_get_lib(char *filename)
 {
-	VFSFile file(filename_build({dirpath, filename}), "r");
-	return file ? file.read_all() : Index<char>();
+    VFSFile file(filename_build({dirpath, filename}), "r");
+    return file ? file.read_all() : Index<char>();
 }
 
-Tuple PSFPlugin::read_tuple(const char *filename, VFSFile &file)
+bool PSFPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-	Tuple t;
-	corlett_t *c;
-
-	Index<char> buf = file.read_all ();
+    Index<char> buf = file.read_all ();
+    if (!buf.len())
+        return false;
 
-	if (!buf.len())
-		return t;
+    corlett_t *c;
+    if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
+        return false;
 
-	if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
-		return t;
+    tuple.set_int(Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
+    tuple.set_str(Tuple::Artist, c->inf_artist);
+    tuple.set_str(Tuple::Album, c->inf_game);
+    tuple.set_str(Tuple::Title, c->inf_title);
+    tuple.set_str(Tuple::Copyright, c->inf_copy);
+    tuple.set_str(Tuple::Quality, _("sequenced"));
+    tuple.set_str(Tuple::Codec, "PlayStation 1/2 Audio");
 
-	t.set_filename (filename);
+    free(c);
 
-	t.set_int (Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
-	t.set_str (Tuple::Artist, c->inf_artist);
-	t.set_str (Tuple::Album, c->inf_game);
-	t.set_str (Tuple::Title, c->inf_title);
-	t.set_str (Tuple::Copyright, c->inf_copy);
-	t.set_str (Tuple::Quality, _("sequenced"));
-	t.set_str (Tuple::Codec, "PlayStation 1/2 Audio");
-
-	free(c);
-
-	return t;
+    return true;
 }
 
 bool PSFPlugin::play(const char *filename, VFSFile &file)
 {
-	bool error = false;
+    bool error = false;
+
+    const char * slash = strrchr (filename, '/');
+    if (! slash)
+        return false;
 
-	const char * slash = strrchr (filename, '/');
-	if (! slash)
-		return false;
+    dirpath = String (str_copy (filename, slash + 1 - filename));
 
-	dirpath = String (str_copy (filename, slash + 1 - filename));
+    Index<char> buf = file.read_all ();
 
-	Index<char> buf = file.read_all ();
+    PSFEngine eng = psf_probe(buf.begin(), buf.len());
+    if (eng == ENG_NONE || eng == ENG_COUNT)
+    {
+        error = true;
+        goto cleanup;
+    }
 
-	PSFEngine eng = psf_probe(buf.begin(), buf.len());
-	if (eng == ENG_NONE || eng == ENG_COUNT)
-	{
-		error = true;
-		goto cleanup;
-	}
+    f = &psf_functor_map[eng];
 
-	f = &psf_functor_map[eng];
-	if (f->start((uint8_t *)buf.begin(), buf.len()) != AO_SUCCESS)
-	{
-		error = true;
-		goto cleanup;
-	}
+    set_stream_bitrate(44100*2*2*8);
+    open_audio(FMT_S16_NE, 44100, 2);
 
-	set_stream_bitrate(44100*2*2*8);
-	open_audio(FMT_S16_NE, 44100, 2);
+    reverse_seek = -1;
 
-	stop_flag = false;
+    /* This loop will restart playback from the beginning when necessary to seek
+     * backwards in the file (reverse_seek >= 0). */
+    do
+    {
+        if (f->start((uint8_t *)buf.begin(), buf.len()) != AO_SUCCESS)
+        {
+            error = true;
+            goto cleanup;
+        }
 
-	f->execute(update);
-	f->stop();
+        if (reverse_seek >= 0)
+        {
+            f->seek(reverse_seek); /* should never fail here */
+            reverse_seek = -1;
+        }
+
+        stop_flag = false;
+
+        f->execute(update);
+        f->stop();
+    }
+    while (reverse_seek >= 0);
 
 cleanup:
-	f = nullptr;
-	dirpath = String ();
+    f = nullptr;
+    dirpath = String ();
 
-	return ! error;
+    return ! error;
 }
 
 void PSFPlugin::update(const void *data, int bytes)
 {
-	if (!data || check_stop())
-	{
-		stop_flag = true;
-		return;
-	}
-
-	int seek = check_seek();
-
-	if (seek >= 0)
-	{
-		f->seek(seek);
-		return;
-	}
-
-	write_audio(data, bytes);
+    if (!data || check_stop())
+    {
+        stop_flag = true;
+        return;
+    }
+
+    int seek = check_seek();
+
+    if (seek >= 0)
+    {
+        if (!f->seek(seek))
+        {
+            reverse_seek = seek;
+            stop_flag = true;
+        }
+
+        return;
+    }
+
+    write_audio(data, bytes);
 }
 
 bool PSFPlugin::is_our_file(const char *filename, VFSFile &file)
 {
-	char magic[4];
-	if (file.fread (magic, 1, 4) < 4)
-		return false;
+    char magic[4];
+    if (file.fread (magic, 1, 4) < 4)
+        return false;
 
-	return (psf_probe(magic, 4) != ENG_NONE);
+    return (psf_probe(magic, 4) != ENG_NONE);
 }
 
 const char *const PSFPlugin::exts[] = { "psf", "minipsf", "psf2", "minipsf2", "spu", "spx", nullptr };
diff --git a/src/pulse_audio/Makefile b/src/pulse/Makefile
index 831fc89..831fc89 100644
--- a/src/pulse_audio/Makefile
+++ b/src/pulse/Makefile
diff --git a/src/pulse/pulse_audio.cc b/src/pulse/pulse_audio.cc
new file mode 100644
index 0000000..b732f8d
--- /dev/null
+++ b/src/pulse/pulse_audio.cc
@@ -0,0 +1,506 @@
+/***
+  This file is part of xmms-pulse.
+
+  Updates for Audacious are:
+  Copyright 2016 John Lindgren
+
+  xmms-pulse 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.
+
+  xmms-pulse 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 xmms-pulse; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA.
+***/
+
+#include <condition_variable>
+#include <mutex>
+
+#include <pulse/pulseaudio.h>
+
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/i18n.h>
+
+using scoped_lock = std::unique_lock<std::mutex>;
+
+class PulseOutput : public OutputPlugin
+{
+public:
+    static const char about[];
+
+    static constexpr PluginInfo info = {
+        N_("PulseAudio Output"),
+        PACKAGE,
+        about
+    };
+
+    constexpr PulseOutput () : OutputPlugin (info, 8) {}
+
+    bool init ();
+
+    StereoVolume get_volume ();
+    void set_volume (StereoVolume v);
+
+    bool open_audio (int fmt, int rate, int nch, String & error);
+    void close_audio ();
+
+    void period_wait ();
+    int write_audio (const void * ptr, int length);
+    void drain ();
+
+    int get_delay ();
+
+    void pause (bool pause);
+    void flush ();
+};
+
+EXPORT PulseOutput aud_plugin_instance;
+
+static std::mutex pulse_mutex;
+static std::condition_variable pulse_cond;
+
+static pa_context * context = nullptr;
+static pa_stream * stream = nullptr;
+static pa_mainloop * mainloop = nullptr;
+
+static bool connected, flushed, polling;
+
+static pa_cvolume volume;
+
+/* Check whether the connection is still alive. */
+static bool alive ()
+{
+    return pa_context_get_state (context) == PA_CONTEXT_READY &&
+     pa_stream_get_state (stream) == PA_STREAM_READY;
+}
+
+/* Cooperative polling method.  Only one thread calls the actual poll function,
+ * and dispatches the events received.  Any other threads simply wait for the
+ * first thread to finish. */
+static void poll_events (scoped_lock & lock)
+{
+    if (polling)
+        pulse_cond.wait (lock);
+    else
+    {
+        pa_mainloop_prepare (mainloop, -1);
+
+        polling = true;
+        lock.unlock ();
+
+        pa_mainloop_poll (mainloop);
+
+        lock.lock ();
+        polling = false;
+
+        pa_mainloop_dispatch (mainloop);
+
+        pulse_cond.notify_all ();
+    }
+}
+
+/* Wait for an asynchronous operation to complete.  Return immediately if the
+ * connection dies. */
+static bool finish (pa_operation * op, scoped_lock & lock)
+{
+    pa_operation_state_t state;
+    while ((state = pa_operation_get_state (op)) != PA_OPERATION_DONE && alive ())
+        poll_events (lock);
+
+    pa_operation_unref (op);
+    return (state == PA_OPERATION_DONE);
+}
+
+#define REPORT(function) do { \
+    AUDERR ("%s() failed: %s\n", function, pa_strerror (pa_context_errno (context))); \
+} while (0)
+
+#define CHECK(function, ...) do { \
+    auto op = function (__VA_ARGS__, & success); \
+    if (! op || ! finish (op, lock) || ! success) \
+        REPORT (#function); \
+} while (0)
+
+static void info_cb (pa_context *, const pa_sink_input_info * i, int, void * userdata)
+{
+    if (! i)
+        return;
+
+    volume = i->volume;
+
+    if (userdata)
+        * (int *) userdata = 1;
+}
+
+static void subscribe_cb (pa_context * c, pa_subscription_event_type t, uint32_t index, void *)
+{
+    pa_operation * o;
+
+    if (! stream || index != pa_stream_get_index (stream) ||
+        (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE) &&
+         t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_NEW)))
+        return;
+
+    if (! (o = pa_context_get_sink_input_info (c, index, info_cb, nullptr)))
+    {
+        REPORT ("pa_context_get_sink_input_info");
+        return;
+    }
+
+    pa_operation_unref (o);
+}
+
+static void stream_success_cb (pa_stream *, int success, void * userdata)
+{
+    if (userdata)
+        * (int * ) userdata = success;
+}
+
+static void context_success_cb (pa_context *, int success, void * userdata)
+{
+    if (userdata)
+        * (int * ) userdata = success;
+}
+
+StereoVolume PulseOutput::get_volume ()
+{
+    scoped_lock lock (pulse_mutex);
+
+    if (! connected)
+        return {0, 0};
+
+    if (! polling)
+    {
+        /* read any pending events to get the lastest volume */
+        while (pa_mainloop_iterate (mainloop, 0, nullptr) > 0)
+            continue;
+    }
+
+    StereoVolume v;
+    if (volume.channels == 2)
+    {
+        v.left = aud::rescale<int> (volume.values[0], PA_VOLUME_NORM, 100);
+        v.right = aud::rescale<int> (volume.values[1], PA_VOLUME_NORM, 100);
+    }
+    else
+        v.left = v.right = aud::rescale<int> (pa_cvolume_avg (& volume), PA_VOLUME_NORM, 100);
+
+    return v;
+}
+
+void PulseOutput::set_volume (StereoVolume v)
+{
+    scoped_lock lock (pulse_mutex);
+
+    if (! connected)
+        return;
+
+    if (volume.channels != 1)
+    {
+        volume.values[0] = aud::rescale<int> (v.left, 100, PA_VOLUME_NORM);
+        volume.values[1] = aud::rescale<int> (v.right, 100, PA_VOLUME_NORM);
+        volume.channels = 2;
+    }
+    else
+    {
+        volume.values[0] = aud::rescale<int> (aud::max (v.left, v.right), 100, PA_VOLUME_NORM);
+        volume.channels = 1;
+    }
+
+    int success = 0;
+    CHECK (pa_context_set_sink_input_volume, context,
+     pa_stream_get_index (stream), & volume, context_success_cb);
+}
+
+void PulseOutput::pause (bool pause)
+{
+    scoped_lock lock (pulse_mutex);
+
+    int success = 0;
+    CHECK (pa_stream_cork, stream, pause, stream_success_cb);
+}
+
+int PulseOutput::get_delay ()
+{
+    scoped_lock lock (pulse_mutex);
+
+    pa_usec_t usec;
+    int neg;
+
+    if (pa_stream_get_latency (stream, & usec, & neg) == PA_OK)
+        return usec / 1000;
+    else
+        return 0;
+}
+
+void PulseOutput::drain ()
+{
+    scoped_lock lock (pulse_mutex);
+
+    int success = 0;
+    CHECK (pa_stream_drain, stream, stream_success_cb);
+}
+
+void PulseOutput::flush ()
+{
+    scoped_lock lock (pulse_mutex);
+
+    int success = 0;
+    CHECK (pa_stream_flush, stream, stream_success_cb);
+
+    /* wake up period_wait() */
+    flushed = true;
+    if (polling)
+        pa_mainloop_wakeup (mainloop);
+}
+
+void PulseOutput::period_wait ()
+{
+    scoped_lock lock (pulse_mutex);
+
+    int success = 0;
+    CHECK (pa_stream_trigger, stream, stream_success_cb);
+
+    /* if the connection dies, wait until flush() is called */
+    while ((! pa_stream_writable_size (stream) || ! alive ()) && ! flushed)
+        poll_events (lock);
+}
+
+int PulseOutput::write_audio (const void * ptr, int length)
+{
+    scoped_lock lock (pulse_mutex);
+    int ret = 0;
+
+    length = aud::min ((size_t) length, pa_stream_writable_size (stream));
+
+    if (pa_stream_write (stream, ptr, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
+        REPORT ("pa_stream_write");
+    else
+        ret = length;
+
+    flushed = false;
+    return ret;
+}
+
+static void close_audio_locked (scoped_lock & lock)
+{
+    /* wait for any parallel tasks (e.g. set_volume()) to complete */
+    while (polling)
+        pulse_cond.wait (lock);
+
+    connected = false;
+
+    if (stream)
+    {
+        pa_stream_disconnect (stream);
+        pa_stream_unref (stream);
+        stream = nullptr;
+    }
+
+    if (context)
+    {
+        pa_context_disconnect (context);
+        pa_context_unref (context);
+        context = nullptr;
+    }
+
+    if (mainloop)
+    {
+        pa_mainloop_free (mainloop);
+        mainloop = nullptr;
+    }
+}
+
+void PulseOutput::close_audio ()
+{
+    scoped_lock lock (pulse_mutex);
+    close_audio_locked (lock);
+}
+
+static pa_sample_format_t to_pulse_format (int aformat)
+{
+    switch (aformat)
+    {
+        case FMT_U8:      return PA_SAMPLE_U8;
+        case FMT_S16_LE:  return PA_SAMPLE_S16LE;
+        case FMT_S16_BE:  return PA_SAMPLE_S16BE;
+#ifdef PA_SAMPLE_S24_32LE
+        case FMT_S24_LE:  return PA_SAMPLE_S24_32LE;
+        case FMT_S24_BE:  return PA_SAMPLE_S24_32BE;
+#endif
+#ifdef PA_SAMPLE_S32LE
+        case FMT_S32_LE:  return PA_SAMPLE_S32LE;
+        case FMT_S32_BE:  return PA_SAMPLE_S32BE;
+#endif
+        case FMT_FLOAT:   return PA_SAMPLE_FLOAT32NE;
+        default:          return PA_SAMPLE_INVALID;
+    }
+}
+
+static bool set_sample_spec (pa_sample_spec & ss, int fmt, int rate, int nch)
+{
+    ss.format = to_pulse_format (fmt);
+    if (ss.format == PA_SAMPLE_INVALID)
+        return false;
+
+    ss.rate = rate;
+    ss.channels = nch;
+
+    return pa_sample_spec_valid (& ss);
+}
+
+static void set_buffer_attr (pa_buffer_attr & buffer, const pa_sample_spec & ss)
+{
+    int buffer_ms = aud_get_int (nullptr, "output_buffer_size");
+    size_t buffer_size = pa_usec_to_bytes ((pa_usec_t) 1000 * buffer_ms, & ss);
+
+    buffer.maxlength = (uint32_t) -1;
+    buffer.tlength = buffer_size;
+    buffer.prebuf = (uint32_t) -1;
+    buffer.minreq = (uint32_t) -1;
+    buffer.fragsize = buffer_size;
+}
+
+static bool create_context (scoped_lock & lock)
+{
+    if (! (mainloop = pa_mainloop_new ()))
+    {
+        AUDERR ("Failed to allocate main loop\n");
+        return false;
+    }
+
+    if (! (context = pa_context_new (pa_mainloop_get_api (mainloop), "Audacious")))
+    {
+        AUDERR ("Failed to allocate context\n");
+        return false;
+    }
+
+    if (pa_context_connect (context, nullptr, (pa_context_flags_t) 0, nullptr) < 0)
+    {
+        REPORT ("pa_context_connect");
+        return false;
+    }
+
+    /* Wait until the context is ready */
+    pa_context_state_t cstate;
+    while ((cstate = pa_context_get_state (context)) != PA_CONTEXT_READY)
+    {
+        if (cstate == PA_CONTEXT_TERMINATED || cstate == PA_CONTEXT_FAILED)
+        {
+            REPORT ("pa_context_connect");
+            return false;
+        }
+
+        poll_events (lock);
+    }
+
+    return true;
+}
+
+static bool create_stream (scoped_lock & lock, const pa_sample_spec & ss)
+{
+    if (! (stream = pa_stream_new (context, "Audacious", & ss, nullptr)))
+    {
+        REPORT ("pa_stream_new");
+        return false;
+    }
+
+    /* Connect stream with sink and default volume */
+    pa_buffer_attr buffer;
+    set_buffer_attr (buffer, ss);
+
+    auto flags = pa_stream_flags_t (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE);
+    if (pa_stream_connect_playback (stream, nullptr, & buffer, flags, nullptr, nullptr) < 0)
+    {
+        REPORT ("pa_stream_connect_playback");
+        return false;
+    }
+
+    /* Wait until the stream is ready */
+    pa_stream_state_t sstate;
+    while ((sstate = pa_stream_get_state (stream)) != PA_STREAM_READY)
+    {
+        if (sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED)
+        {
+            REPORT ("pa_stream_connect_playback");
+            return false;
+        }
+
+        poll_events (lock);
+    }
+
+    return true;
+}
+
+static bool subscribe_events (scoped_lock & lock)
+{
+    pa_context_set_subscribe_callback (context, subscribe_cb, nullptr);
+
+    /* Now subscribe to events */
+    int success = 0;
+    CHECK (pa_context_subscribe, context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb);
+    if (! success)
+        return false;
+
+    /* Now request the initial stream info */
+    success = 0;
+    CHECK (pa_context_get_sink_input_info, context, pa_stream_get_index (stream), info_cb);
+    if (! success)
+        return false;
+
+    return true;
+}
+
+bool PulseOutput::open_audio (int fmt, int rate, int nch, String & error)
+{
+    scoped_lock lock (pulse_mutex);
+
+    pa_sample_spec ss;
+    if (! set_sample_spec (ss, fmt, rate, nch))
+        return false;
+
+    if (! create_context (lock) ||
+        ! create_stream (lock, ss) ||
+        ! subscribe_events (lock))
+    {
+        close_audio_locked (lock);
+        return false;
+    }
+
+    connected = true;
+    flushed = true;
+    return true;
+}
+
+bool PulseOutput::init ()
+{
+    String error;
+    if (! open_audio (FMT_S16_NE, 44100, 2, error))
+        return false;
+
+    close_audio ();
+    return true;
+}
+
+const char PulseOutput::about[] =
+ N_("Audacious PulseAudio Output Plugin\n\n"
+    "This program is free software; you can redistribute it and/or modify "
+    "it under the terms of the GNU General Public License as published by "
+    "the Free Software Foundation; either version 2 of the License, or "
+    "(at your option) any later version.\n\n"
+    "This program is distributed in the hope that it will be useful, "
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+    "GNU General Public License for more details.\n\n"
+    "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/src/pulse_audio/pulse_audio.cc b/src/pulse_audio/pulse_audio.cc
deleted file mode 100644
index 4e828e8..0000000
--- a/src/pulse_audio/pulse_audio.cc
+++ /dev/null
@@ -1,625 +0,0 @@
-/***
-  This file is part of xmms-pulse.
-
-  xmms-pulse 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.
-
-  xmms-pulse 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 xmms-pulse; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA.
-***/
-
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include <pulse/pulseaudio.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/i18n.h>
-
-class PulseOutput : public OutputPlugin
-{
-public:
-    static const char about[];
-
-    static constexpr PluginInfo info = {
-        N_("PulseAudio Output"),
-        PACKAGE,
-        about
-    };
-
-    constexpr PulseOutput () : OutputPlugin (info, 8) {}
-
-    bool init ();
-
-    StereoVolume get_volume ();
-    void set_volume (StereoVolume v);
-
-    bool open_audio (int fmt, int rate, int nch);
-    void close_audio ();
-
-    void period_wait ();
-    int write_audio (const void * ptr, int length);
-    void drain ();
-
-    int get_delay ();
-
-    void pause (bool pause);
-    void flush ();
-};
-
-EXPORT PulseOutput aud_plugin_instance;
-
-static pa_context *context = nullptr;
-static pa_stream *stream = nullptr;
-static pa_threaded_mainloop *mainloop = nullptr;
-
-static pa_cvolume volume;
-static bool volume_valid = false;
-
-static bool connected = false;
-
-#define CHECK_DEAD_GOTO(label, warn) do { \
-if (!mainloop || \
-    !context || pa_context_get_state(context) != PA_CONTEXT_READY || \
-    !stream || pa_stream_get_state(stream) != PA_STREAM_READY) { \
-        if (warn) \
-            AUDDBG("Connection died: %s\n", context ? pa_strerror(pa_context_errno(context)) : "nullptr"); \
-        goto label; \
-    }  \
-} while(0);
-
-#define CHECK_CONNECTED(retval) \
-do { \
-    if (!connected) return retval; \
-} while (0);
-
-static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
-    assert(c);
-
-    if (!i)
-        return;
-
-    volume = i->volume;
-    volume_valid = true;
-}
-
-static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) {
-    pa_operation *o;
-
-    assert(c);
-
-    if (!stream ||
-        index != pa_stream_get_index(stream) ||
-        (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE) &&
-         t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW)))
-        return;
-
-    if (!(o = pa_context_get_sink_input_info(c, index, info_cb, nullptr))) {
-        AUDDBG("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(c)));
-        return;
-    }
-
-    pa_operation_unref(o);
-}
-
-static void context_state_cb(pa_context *c, void *userdata) {
-    assert(c);
-
-    switch (pa_context_get_state(c)) {
-        case PA_CONTEXT_READY:
-        case PA_CONTEXT_TERMINATED:
-        case PA_CONTEXT_FAILED:
-            pa_threaded_mainloop_signal(mainloop, 0);
-            break;
-
-        case PA_CONTEXT_UNCONNECTED:
-        case PA_CONTEXT_CONNECTING:
-        case PA_CONTEXT_AUTHORIZING:
-        case PA_CONTEXT_SETTING_NAME:
-            break;
-    }
-}
-
-static void stream_state_cb(pa_stream *s, void * userdata) {
-    assert(s);
-
-    switch (pa_stream_get_state(s)) {
-
-        case PA_STREAM_READY:
-        case PA_STREAM_FAILED:
-        case PA_STREAM_TERMINATED:
-            pa_threaded_mainloop_signal(mainloop, 0);
-            break;
-
-        case PA_STREAM_UNCONNECTED:
-        case PA_STREAM_CREATING:
-            break;
-    }
-}
-
-static void stream_success_cb(pa_stream *s, int success, void *userdata) {
-    assert(s);
-
-    if (userdata)
-        *(int*) userdata = success;
-
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void context_success_cb(pa_context *c, int success, void *userdata) {
-    assert(c);
-
-    if (userdata)
-        *(int*) userdata = success;
-
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
-    assert(s);
-
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void stream_latency_update_cb(pa_stream *s, void *userdata) {
-    assert(s);
-
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-StereoVolume PulseOutput::get_volume ()
-{
-    StereoVolume v = {0, 0};
-
-    if (! connected || ! volume_valid)
-        return v;
-
-    pa_threaded_mainloop_lock (mainloop);
-    CHECK_DEAD_GOTO (fail, 1);
-
-    if (volume.channels == 2)
-    {
-        v.left = aud::rescale<int> (volume.values[0], PA_VOLUME_NORM, 100);
-        v.right = aud::rescale<int> (volume.values[1], PA_VOLUME_NORM, 100);
-    }
-    else
-        v.left = v.right = aud::rescale<int> (pa_cvolume_avg (& volume), PA_VOLUME_NORM, 100);
-
-fail:
-    pa_threaded_mainloop_unlock (mainloop);
-    return v;
-}
-
-void PulseOutput::set_volume (StereoVolume v)
-{
-    pa_operation * o;
-
-    if (! connected)
-        return;
-
-    pa_threaded_mainloop_lock (mainloop);
-    CHECK_DEAD_GOTO (fail, 1);
-
-    if (! volume_valid || volume.channels != 1)
-    {
-        volume.values[0] = aud::rescale<int> (v.left, 100, PA_VOLUME_NORM);
-        volume.values[1] = aud::rescale<int> (v.right, 100, PA_VOLUME_NORM);
-        volume.channels = 2;
-    }
-    else
-    {
-        volume.values[0] = aud::rescale<int> (aud::max (v.left, v.right), 100, PA_VOLUME_NORM);
-        volume.channels = 1;
-    }
-
-    volume_valid = true;
-
-    if (! (o = pa_context_set_sink_input_volume (context, pa_stream_get_index
-     (stream), & volume, nullptr, nullptr)))
-        AUDDBG ("pa_context_set_sink_input_volume() failed: %s\n", pa_strerror
-         (pa_context_errno (context)));
-    else
-        pa_operation_unref(o);
-
-fail:
-    pa_threaded_mainloop_unlock (mainloop);
-}
-
-void PulseOutput::pause (bool pause)
-{
-    pa_operation *o = nullptr;
-    int success = 0;
-
-    CHECK_CONNECTED();
-
-    pa_threaded_mainloop_lock(mainloop);
-    CHECK_DEAD_GOTO(fail, 1);
-
-    if (!(o = pa_stream_cork(stream, pause, stream_success_cb, &success))) {
-        AUDDBG("pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto fail;
-    }
-
-    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
-        CHECK_DEAD_GOTO(fail, 1);
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    if (!success)
-        AUDDBG("pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
-
-    if (o)
-        pa_operation_unref(o);
-
-    pa_threaded_mainloop_unlock(mainloop);
-}
-
-int PulseOutput::get_delay ()
-{
-    int delay = 0;
-
-    CHECK_CONNECTED(0);
-
-    pa_threaded_mainloop_lock(mainloop);
-
-    pa_usec_t usec;
-    int neg;
-    if (pa_stream_get_latency (stream, & usec, & neg) == PA_OK)
-        delay = usec / 1000;
-
-    pa_threaded_mainloop_unlock(mainloop);
-
-    return delay;
-}
-
-void PulseOutput::drain ()
-{
-    pa_operation *o = nullptr;
-    int success = 0;
-
-    CHECK_CONNECTED();
-
-    pa_threaded_mainloop_lock(mainloop);
-    CHECK_DEAD_GOTO(fail, 0);
-
-    if (!(o = pa_stream_drain(stream, stream_success_cb, &success))) {
-        AUDDBG("pa_stream_drain() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto fail;
-    }
-
-    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
-        CHECK_DEAD_GOTO(fail, 1);
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    if (!success)
-        AUDDBG("pa_stream_drain() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
-    if (o)
-        pa_operation_unref(o);
-
-    pa_threaded_mainloop_unlock(mainloop);
-}
-
-void PulseOutput::flush ()
-{
-    pa_operation *o = nullptr;
-    int success = 0;
-
-    CHECK_CONNECTED();
-
-    pa_threaded_mainloop_lock(mainloop);
-    CHECK_DEAD_GOTO(fail, 1);
-
-    if (!(o = pa_stream_flush(stream, stream_success_cb, &success))) {
-        AUDDBG("pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto fail;
-    }
-
-    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
-        CHECK_DEAD_GOTO(fail, 1);
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    if (!success)
-        AUDDBG("pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
-    if (o)
-        pa_operation_unref(o);
-
-    pa_threaded_mainloop_unlock(mainloop);
-}
-
-void PulseOutput::period_wait ()
-{
-    pa_operation * o = nullptr;
-    int success = 0;
-
-    CHECK_CONNECTED ();
-
-    pa_threaded_mainloop_lock (mainloop);
-    CHECK_DEAD_GOTO (fail, 1);
-
-    if (! (o = pa_stream_trigger (stream, stream_success_cb, & success)))
-    {
-        AUDDBG ("pa_stream_trigger() failed: %s\n", pa_strerror (pa_context_errno (context)));
-        goto fail;
-    }
-
-    while (pa_operation_get_state (o) != PA_OPERATION_DONE)
-    {
-        CHECK_DEAD_GOTO (fail, 1);
-        pa_threaded_mainloop_wait (mainloop);
-    }
-
-    if (! success)
-        AUDDBG ("pa_stream_trigger() failed: %s\n", pa_strerror (pa_context_errno (context)));
-
-    while (! pa_stream_writable_size (stream))
-    {
-        CHECK_DEAD_GOTO (fail, 1);
-        pa_threaded_mainloop_wait (mainloop);
-    }
-
-fail:
-    if (o)
-        pa_operation_unref(o);
-
-    pa_threaded_mainloop_unlock (mainloop);
-}
-
-int PulseOutput::write_audio (const void * ptr, int length)
-{
-    CHECK_CONNECTED(0);
-
-    int ret = 0;
-    pa_threaded_mainloop_lock(mainloop);
-    CHECK_DEAD_GOTO(fail, 1);
-
-    length = aud::min ((size_t) length, pa_stream_writable_size (stream));
-
-    if (pa_stream_write (stream, ptr, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
-    {
-        AUDDBG ("pa_stream_write() failed: %s\n", pa_strerror (pa_context_errno (context)));
-        goto fail;
-    }
-
-    ret = length;
-
-fail:
-    pa_threaded_mainloop_unlock(mainloop);
-    return ret;
-}
-
-void PulseOutput::close_audio ()
-{
-    connected = false;
-
-    if (mainloop)
-        pa_threaded_mainloop_stop(mainloop);
-
-    if (stream) {
-        pa_stream_disconnect(stream);
-        pa_stream_unref(stream);
-        stream = nullptr;
-    }
-
-    if (context) {
-        pa_context_disconnect(context);
-        pa_context_unref(context);
-        context = nullptr;
-    }
-
-    if (mainloop) {
-        pa_threaded_mainloop_free(mainloop);
-        mainloop = nullptr;
-    }
-
-    volume_valid = false;
-}
-
-static pa_sample_format_t to_pulse_format (int aformat)
-{
-    switch (aformat)
-    {
-    case FMT_U8:      return PA_SAMPLE_U8;
-    case FMT_S16_LE:  return PA_SAMPLE_S16LE;
-    case FMT_S16_BE:  return PA_SAMPLE_S16BE;
-#ifdef PA_SAMPLE_S24_32LE
-    case FMT_S24_LE:  return PA_SAMPLE_S24_32LE;
-    case FMT_S24_BE:  return PA_SAMPLE_S24_32BE;
-#endif
-#ifdef PA_SAMPLE_S32LE
-    case FMT_S32_LE:  return PA_SAMPLE_S32LE;
-    case FMT_S32_BE:  return PA_SAMPLE_S32BE;
-#endif
-	case FMT_FLOAT:   return PA_SAMPLE_FLOAT32NE;
-    default:          return PA_SAMPLE_INVALID;
-    }
-}
-
-bool PulseOutput::open_audio (int fmt, int rate, int nch)
-{
-    pa_sample_spec ss;
-
-    assert(!mainloop);
-    assert(!context);
-    assert(!stream);
-    assert(!connected);
-
-    ss.format = to_pulse_format (fmt);
-    if (ss.format == PA_SAMPLE_INVALID)
-        return false;
-
-    ss.rate = rate;
-    ss.channels = nch;
-
-    if (!pa_sample_spec_valid(&ss))
-        return false;
-
-    if (!(mainloop = pa_threaded_mainloop_new())) {
-        AUDERR ("Failed to allocate main loop\n");
-        return false;
-    }
-
-    pa_threaded_mainloop_lock(mainloop);
-
-    if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "Audacious"))) {
-        AUDERR ("Failed to allocate context\n");
-        goto FAIL1;
-    }
-
-    pa_context_set_state_callback(context, context_state_cb, nullptr);
-    pa_context_set_subscribe_callback(context, subscribe_cb, nullptr);
-
-    if (pa_context_connect(context, nullptr, (pa_context_flags_t) 0, nullptr) < 0) {
-        AUDERR ("Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL1;
-    }
-
-    if (pa_threaded_mainloop_start(mainloop) < 0) {
-        AUDERR ("Failed to start main loop\n");
-        goto FAIL1;
-    }
-
-    /* Wait until the context is ready */
-    pa_threaded_mainloop_wait(mainloop);
-
-    if (pa_context_get_state(context) != PA_CONTEXT_READY) {
-        AUDERR ("Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL1;
-    }
-
-    if (!(stream = pa_stream_new(context, "Audacious", &ss, nullptr))) {
-        AUDERR ("Failed to create stream: %s\n", pa_strerror(pa_context_errno(context)));
-
-FAIL1:
-        pa_threaded_mainloop_unlock (mainloop);
-        close_audio ();
-        return false;
-    }
-
-    pa_stream_set_state_callback(stream, stream_state_cb, nullptr);
-    pa_stream_set_write_callback(stream, stream_request_cb, nullptr);
-    pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, nullptr);
-
-    /* Connect stream with sink and default volume */
-    /* Buffer struct */
-
-    int aud_buffer = aud_get_int(nullptr, "output_buffer_size");
-    size_t buffer_size = pa_usec_to_bytes(aud_buffer, &ss) * 1000;
-    pa_buffer_attr buffer = {(uint32_t) -1, (uint32_t) buffer_size,
-     (uint32_t) -1, (uint32_t) -1, (uint32_t) buffer_size};
-
-    pa_operation *o = nullptr;
-    int success;
-
-    if (pa_stream_connect_playback (stream, nullptr, & buffer, (pa_stream_flags_t)
-     (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
-    {
-        AUDERR ("Failed to connect stream: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-
-
-    /* Wait until the stream is ready */
-    pa_threaded_mainloop_wait(mainloop);
-
-    if (pa_stream_get_state(stream) != PA_STREAM_READY) {
-        AUDERR ("Failed to connect stream: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-
-    /* Now subscribe to events */
-    if (!(o = pa_context_subscribe(context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb, &success))) {
-        AUDERR ("pa_context_subscribe() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-
-    success = 0;
-    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
-        CHECK_DEAD_GOTO(FAIL2, 1);
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    if (!success) {
-        AUDERR ("pa_context_subscribe() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-
-    pa_operation_unref(o);
-
-    /* Now request the initial stream info */
-    if (!(o = pa_context_get_sink_input_info(context, pa_stream_get_index(stream), info_cb, nullptr))) {
-        AUDERR ("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-
-    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
-        CHECK_DEAD_GOTO(FAIL2, 1);
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    if (!volume_valid) {
-        AUDERR ("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context)));
-        goto FAIL2;
-    }
-    pa_operation_unref(o);
-
-    connected = true;
-
-    pa_threaded_mainloop_unlock(mainloop);
-
-    return true;
-
-FAIL2:
-    if (o)
-        pa_operation_unref(o);
-
-    pa_threaded_mainloop_unlock(mainloop);
-    close_audio ();
-    return false;
-}
-
-bool PulseOutput::init ()
-{
-    if (! open_audio (FMT_S16_NE, 44100, 2))
-        return false;
-
-    close_audio ();
-    return true;
-}
-
-const char PulseOutput::about[] =
- N_("Audacious PulseAudio Output Plugin\n\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"
-    "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,\n"
-    "USA.");
diff --git a/src/qtaudio/qtaudio.cc b/src/qtaudio/qtaudio.cc
index e994283..6bf48ea 100644
--- a/src/qtaudio/qtaudio.cc
+++ b/src/qtaudio/qtaudio.cc
@@ -27,7 +27,6 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
@@ -35,10 +34,6 @@
 
 #define VOLUME_RANGE 40 /* decibels */
 
-#define error(...) do { \
-    aud_ui_show_error (str_printf ("QtAudio error: " __VA_ARGS__)); \
-} while (0)
-
 class QtAudio : public OutputPlugin
 {
 public:
@@ -58,7 +53,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume v);
 
-    bool open_audio (int aud_format, int rate, int chan);
+    bool open_audio (int aud_format, int rate, int chan, String & error);
     void close_audio ();
 
     void period_wait ();
@@ -143,7 +138,7 @@ void QtAudio::set_volume (StereoVolume v)
     }
 }
 
-bool QtAudio::open_audio (int format, int rate, int chan)
+bool QtAudio::open_audio (int format, int rate, int chan, String & error)
 {
     const FormatDescriptionMap * m = nullptr;
 
@@ -158,7 +153,8 @@ bool QtAudio::open_audio (int format, int rate, int chan)
 
     if (! m)
     {
-        error ("The requested audio format %d is unsupported.\n", format);
+        error = String (str_printf ("QtAudio error: The requested audio format "
+         "%d is unsupported.", format));
         return false;
     }
 
@@ -186,7 +182,7 @@ bool QtAudio::open_audio (int format, int rate, int chan)
     QAudioDeviceInfo info (QAudioDeviceInfo::defaultOutputDevice ());
     if (! info.isFormatSupported (fmt))
     {
-        error ("Format not supported by backend.\n");
+        error = String ("QtAudio error: Format not supported by backend.");
         return false;
     }
 
diff --git a/src/gl-spectrum-qt/Makefile b/src/qtglspectrum/Makefile
index c4abd2b..c4abd2b 100644
--- a/src/gl-spectrum-qt/Makefile
+++ b/src/qtglspectrum/Makefile
diff --git a/src/gl-spectrum-qt/gl-spectrum.cc b/src/qtglspectrum/gl-spectrum.cc
index ea85e39..1f2a38e 100644
--- a/src/gl-spectrum-qt/gl-spectrum.cc
+++ b/src/qtglspectrum/gl-spectrum.cc
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <string.h>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 
@@ -53,7 +52,9 @@ public:
     static constexpr PluginInfo info = {
         N_("OpenGL Spectrum Analyzer"),
         PACKAGE,
-        gl_about
+        gl_about,
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr GLSpectrumQt () : VisPlugin (info, Visualizer::Freq) {}
diff --git a/src/qtui/Makefile b/src/qtui/Makefile
index 5808c32..0a1823f 100644
--- a/src/qtui/Makefile
+++ b/src/qtui/Makefile
@@ -3,7 +3,7 @@ PLUGIN = qtui${PLUGIN_SUFFIX}
 SRCS = qtui.cc \
        dialog_windows.cc \
        main_window.cc \
-       main_window_actions.cc \
+       menus.cc \
        playlist.cc \
        playlist_model.cc \
        playlist_tabs.cc \
diff --git a/src/qtui/dialog_windows.cc b/src/qtui/dialog_windows.cc
index 1a0b720..05c47d6 100644
--- a/src/qtui/dialog_windows.cc
+++ b/src/qtui/dialog_windows.cc
@@ -38,6 +38,11 @@ void DialogWindows::show_error (const char * message)
     audqt::simple_message (_("Error"), message, QMessageBox::Critical);
 }
 
+void DialogWindows::show_info (const char * message)
+{
+    audqt::simple_message (_("Information"), message, QMessageBox::Information);
+}
+
 void DialogWindows::show_progress (const char * message)
 {
     create_progress ();
diff --git a/src/qtui/dialog_windows.h b/src/qtui/dialog_windows.h
index 8b5468d..f6a6778 100644
--- a/src/qtui/dialog_windows.h
+++ b/src/qtui/dialog_windows.h
@@ -37,6 +37,7 @@ private:
 
     void create_progress ();
     void show_error (const char * message);
+    void show_info (const char * message);
     void show_progress (const char * message);
     void show_progress_2 (const char * message);
     void hide_progress ();
@@ -44,7 +45,8 @@ private:
     const HookReceiver<DialogWindows, const char *>
      show_hook1 {"ui show progress", this, & DialogWindows::show_progress},
      show_hook2 {"ui show progress 2", this, & DialogWindows::show_progress_2},
-     show_hook3 {"ui show error", this, & DialogWindows::show_error};
+     show_hook3 {"ui show error", this, & DialogWindows::show_error},
+     show_hook4 {"ui show info", this, & DialogWindows::show_info};
     const HookReceiver<DialogWindows>
      hide_hook {"ui hide progress", this, & DialogWindows::hide_progress};
 };
diff --git a/src/qtui/info_bar.h b/src/qtui/info_bar.h
index 75b5a30..2404967 100644
--- a/src/qtui/info_bar.h
+++ b/src/qtui/info_bar.h
@@ -24,7 +24,6 @@
 #include <QWidget>
 
 #include <libaudcore/hook.h>
-#include <libaudcore/visualizer.h>
 
 class InfoVis;
 
diff --git a/src/qtui/main_window.cc b/src/qtui/main_window.cc
index 6f0b56d..57e4791 100644
--- a/src/qtui/main_window.cc
+++ b/src/qtui/main_window.cc
@@ -25,19 +25,23 @@
 #include <libaudcore/plugins.h>
 
 #include <libaudqt/libaudqt.h>
-#include <libaudqt/volumebutton.h>
 
 #include "filter_input.h"
+#include "info_bar.h"
+#include "menus.h"
 #include "playlist.h"
-#include "time_slider.h"
-#include "status_bar.h"
 #include "playlist_tabs.h"
+#include "status_bar.h"
+#include "time_slider.h"
 #include "tool_bar.h"
 
-#include <QApplication>
-#include <QDockWidget>
 #include <QAction>
+#include <QBoxLayout>
+#include <QCloseEvent>
+#include <QDockWidget>
+#include <QLabel>
 #include <QSettings>
+#include <QToolButton>
 
 class PluginWidget : public QDockWidget
 {
@@ -79,6 +83,12 @@ MainWindow::MainWindow () :
     QIcon::setThemeSearchPaths (paths);
 #endif
 
+    int instance = aud_get_instance ();
+    if (instance == 1)
+        m_config_name = "audacious";
+    else
+        m_config_name = QString ("audacious-%1").arg (instance);
+
     auto slider = new TimeSlider (this);
 
     const ToolBarItem items[] = {
@@ -99,7 +109,7 @@ MainWindow::MainWindow () :
             [] (bool on) { aud_set_bool (nullptr, "repeat", on); }, & toolButtonRepeat),
         ToolBarAction ("media-playlist-shuffle", N_("Shuffle"), N_("Shuffle"),
             [] (bool on) { aud_set_bool (nullptr, "shuffle", on); }, & toolButtonShuffle),
-        ToolBarCustom (new audqt::VolumeButton (this)),
+        ToolBarCustom (audqt::volume_button_new (this)),
         ToolBarCustom (filterInput),
     };
 
@@ -120,7 +130,7 @@ MainWindow::MainWindow () :
 
     connect (filterInput, & QLineEdit::textChanged, playlistTabs, & PlaylistTabs::filterTrigger);
 
-    setupActions ();
+    setMenuBar (qtui_build_menubar (this));
     add_dock_plugins ();
 
     if (aud_drct_get_playing ())
@@ -137,7 +147,7 @@ MainWindow::MainWindow () :
 
 MainWindow::~MainWindow ()
 {
-    QSettings settings ("audacious", "QtUi");
+    QSettings settings (m_config_name, "QtUi");
     settings.setValue ("geometry", saveGeometry ());
     settings.setValue ("windowState", saveState ());
 
@@ -158,7 +168,7 @@ void MainWindow::closeEvent (QCloseEvent * e)
 
 void MainWindow::readSettings ()
 {
-    QSettings settings ("audacious", "QtUi");
+    QSettings settings (m_config_name, "QtUi");
 
     if (! restoreGeometry (settings.value ("geometry").toByteArray ()))
         resize (768, 480);
@@ -183,6 +193,15 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
     QMainWindow::keyPressEvent (e);
 }
 
+void MainWindow::setWindowTitle (const QString & title)
+{
+    int instance = aud_get_instance ();
+    if (instance == 1)
+        QMainWindow::setWindowTitle (title);
+    else
+        QMainWindow::setWindowTitle (QString ("%1 (%2)").arg (title).arg (instance));
+}
+
 void MainWindow::updateToggles ()
 {
     toolButtonRepeat->setChecked (aud_get_bool (nullptr, "repeat"));
diff --git a/src/qtui/main_window.h b/src/qtui/main_window.h
index f24c0e5..654abdd 100644
--- a/src/qtui/main_window.h
+++ b/src/qtui/main_window.h
@@ -23,18 +23,17 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/index.h>
 #include <libaudcore/mainloop.h>
-#include <libaudcore/objects.h>
 
 #include "dialog_windows.h"
-#include "info_bar.h"
 
 #include <QMainWindow>
-#include <QVBoxLayout>
 
 class FilterInput;
+class InfoBar;
 class PlaylistTabs;
 class PluginHandle;
 class PluginWidget;
+class QVBoxLayout;
 
 class MainWindow : public QMainWindow
 {
@@ -43,6 +42,7 @@ public:
     ~MainWindow ();
 
 private:
+    QString m_config_name;
     DialogWindows m_dialogs;
     FilterInput * filterInput;
     PlaylistTabs * playlistTabs;
@@ -59,8 +59,9 @@ private:
     void closeEvent (QCloseEvent * e);
     void keyPressEvent (QKeyEvent * e);
 
+    void setWindowTitle (const QString & title);
+
     void updateToggles ();
-    void setupActions ();
     void readSettings ();
 
     void add_dock_plugins ();
diff --git a/src/qtui/main_window_actions.cc b/src/qtui/menus.cc
index d9f2bf8..d3ca365 100644
--- a/src/qtui/main_window_actions.cc
+++ b/src/qtui/menus.cc
@@ -1,5 +1,5 @@
 /*
- * main_window_actions.cc
+ * menus.cc
  * Copyright 2014 Michał Lipski and William Pitcock
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,8 @@
  * the use of this software.
  */
 
-#include "main_window.h"
+#include "menus.h"
+#include "../ui-common/menu-ops.h"
 
 #include <QMenuBar>
 
@@ -34,6 +35,7 @@
 #include <libaudqt/menu.h>
 
 static QMenu * services_menu () { return audqt::menu_get_by_id (AudMenuID::Main); }
+static QMenu * services_menu_pl () { return audqt::menu_get_by_id (AudMenuID::Playlist); }
 
 static void open_files () { audqt::fileopener_show (audqt::FileMode::Open); }
 static void add_files () { audqt::fileopener_show (audqt::FileMode::Add); }
@@ -42,48 +44,12 @@ static void add_folder () { audqt::fileopener_show (audqt::FileMode::AddFolder);
 static void open_url () { audqt::urlopener_show (true); }
 static void add_url () { audqt::urlopener_show (false); }
 
-static void rm_dupes_title () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void rm_dupes_filename () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Filename); }
-static void rm_dupes_path () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-
-static void sort_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void sort_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void sort_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void sort_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void sort_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void sort_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void sort_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void sort_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void sort_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void sort_custom_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void sort_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void sort_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void sort_sel_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void sort_sel_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void sort_sel_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void sort_sel_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void sort_sel_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void sort_sel_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void sort_sel_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void sort_sel_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void sort_sel_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void sort_sel_custom_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void sort_sel_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void sort_sel_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void pl_play () { aud_playlist_play (aud_playlist_get_active ()); }
-static void pl_refresh () { aud_playlist_rescan (aud_playlist_get_active ()); }
-static void pl_remove_failed () { aud_playlist_remove_failed (aud_playlist_get_active ()); }
 static void pl_rename () { hook_call ("qtui rename playlist", nullptr); }
 static void pl_close () { audqt::playlist_confirm_delete (aud_playlist_get_active ()); }
 
-static void volume_up () { aud_drct_set_volume_main (aud_drct_get_volume_main () + 5); }
-static void volume_down () { aud_drct_set_volume_main (aud_drct_get_volume_main () - 5); }
-
 static void configure_effects () { audqt::prefswin_show_plugin_page (PluginType::Effect); }
 
-void MainWindow::setupActions ()
+QMenuBar * qtui_build_menubar (QWidget * parent)
 {
     static const audqt::MenuItem file_items[] = {
         audqt::MenuCommand ({N_("_Open Files ..."), "document-open", "Ctrl+O"}, open_files),
@@ -192,5 +158,26 @@ void MainWindow::setupActions ()
         audqt::MenuSub ({N_("_Output")}, output_items),
     };
 
-    setMenuBar (audqt::menubar_build (main_items, this));
+    return audqt::menubar_build (main_items, parent);
+}
+
+QMenu * qtui_build_pl_menu (QWidget * parent)
+{
+    static const audqt::MenuItem pl_items[] = {
+        audqt::MenuCommand ({N_("Song _Info ..."), "dialog-information", "Alt+I"}, pl_song_info),
+        audqt::MenuCommand ({N_("_Queue/Unqueue"), nullptr, "Alt+Q"}, pl_queue_toggle),
+        audqt::MenuSep (),
+        audqt::MenuCommand ({N_("_Open Containing Folder"), "folder"}, pl_open_folder),
+        audqt::MenuCommand ({N_("_Refresh Selected"), "view-refresh", "F6"}, pl_refresh_sel),
+        audqt::MenuSep (),
+        audqt::MenuCommand ({N_("Cu_t"), "edit-cut", "Ctrl+X"}, pl_cut),
+        audqt::MenuCommand ({N_("_Copy"), "edit-copy", "Ctrl+C"}, pl_copy),
+        audqt::MenuCommand ({N_("_Paste"), "edit-paste", "Ctrl+V"}, pl_paste),
+        audqt::MenuCommand ({N_("Paste at _End"), "edit-paste", "Shift+Ctrl+V"}, pl_paste_end),
+        audqt::MenuCommand ({N_("Select _All"), "edit-select-all"}, pl_select_all),
+        audqt::MenuSep (),
+        audqt::MenuSub ({N_("_Services")}, services_menu_pl)
+    };
+
+    return audqt::menu_build (pl_items, parent);
 }
diff --git a/src/qtui/menus.h b/src/qtui/menus.h
new file mode 100644
index 0000000..bc1c254
--- /dev/null
+++ b/src/qtui/menus.h
@@ -0,0 +1,30 @@
+/*
+ * menus.h
+ * Copyright 2016 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.
+ */
+
+#ifndef MENUS_H
+#define MENUS_H
+
+class QMenu;
+class QMenuBar;
+class QWidget;
+
+QMenuBar * qtui_build_menubar (QWidget * parent);
+QMenu * qtui_build_pl_menu (QWidget * parent);
+
+#endif // MENUS_H
diff --git a/src/qtui/playlist.cc b/src/qtui/playlist.cc
index 5a9a91e..001193f 100644
--- a/src/qtui/playlist.cc
+++ b/src/qtui/playlist.cc
@@ -18,6 +18,7 @@
  */
 
 #include <QKeyEvent>
+#include <QMenu>
 #include <QSortFilterProxyModel>
 
 #include <libaudcore/audstrings.h>
@@ -29,7 +30,9 @@
 #include "playlist.h"
 #include "playlist_model.h"
 
-PlaylistWidget::PlaylistWidget (QTreeView * parent, int uniqueId) : QTreeView (parent)
+#include "../ui-common/menu-ops.h"
+
+PlaylistWidget::PlaylistWidget (QWidget * parent, int uniqueId) : QTreeView (parent)
 {
     model = new PlaylistModel (nullptr, uniqueId);
 
@@ -38,7 +41,11 @@ PlaylistWidget::PlaylistWidget (QTreeView * parent, int uniqueId) : QTreeView (p
     proxyModel->setSourceModel (model);
     proxyModel->setFilterKeyColumn (-1); /* filter by all columns */
 
+    inUpdate = true; /* prevents changing focused row */
     setModel (proxyModel);
+    inUpdate = false;
+
+    setAllColumnsShowFocus (true);
     setAlternatingRowColors (true);
     setAttribute (Qt::WA_MacShowFocusRect, false);
     setIndentation (0);
@@ -89,6 +96,12 @@ int PlaylistWidget::indexToRow (const QModelIndex & index)
     return proxyModel->mapToSource (index).row ();
 }
 
+void PlaylistWidget::contextMenuEvent (QContextMenuEvent * event)
+{
+    if (contextMenu)
+        contextMenu->popup (event->globalPos ());
+}
+
 void PlaylistWidget::keyPressEvent (QKeyEvent * event)
 {
     switch (event->modifiers ())
@@ -113,7 +126,7 @@ void PlaylistWidget::keyPressEvent (QKeyEvent * event)
             aud_drct_play_pause ();
             break;
         case Qt::Key_Delete:
-            deleteCurrentSelection ();
+            pl_remove_selected ();
             break;
         case Qt::Key_Z:
             aud_drct_pl_prev ();
@@ -130,30 +143,16 @@ void PlaylistWidget::keyPressEvent (QKeyEvent * event)
         case Qt::Key_B:
             aud_drct_pl_next ();
             return;
-        case Qt::Key_Q:
-            toggleQueue ();
-            return;
         }
         break;
     }
 
-     QTreeView::keyPressEvent (event);
-}
-
-void PlaylistWidget::mousePressEvent (QMouseEvent * event)
-{
-    QModelIndex index = indexAt (event->pos ());
-
-    if (! index.isValid ())
-        return;
-
-    QTreeView::mousePressEvent (event);
+    QTreeView::keyPressEvent (event);
 }
 
 void PlaylistWidget::mouseDoubleClickEvent (QMouseEvent * event)
 {
     QModelIndex index = indexAt (event->pos ());
-
     if (! index.isValid ())
         return;
 
@@ -329,22 +328,6 @@ void PlaylistWidget::playCurrentIndex ()
     aud_playlist_play (playlist ());
 }
 
-void PlaylistWidget::deleteCurrentSelection ()
-{
-    aud_playlist_delete_selected (playlist ());
-}
-
-void PlaylistWidget::toggleQueue ()
-{
-    int row = indexToRow (currentIndex ());
-    int at = aud_playlist_queue_find_entry (playlist (), row);
-
-    if (at < 0)
-        aud_playlist_queue_insert (playlist (), -1, row);
-    else
-        aud_playlist_queue_delete (playlist (), at, 1);
-}
-
 void PlaylistWidget::updateSettings ()
 {
     setHeaderHidden (! aud_get_bool ("qtui", "playlist_headers"));
diff --git a/src/qtui/playlist.h b/src/qtui/playlist.h
index e8523c0..be396d9 100644
--- a/src/qtui/playlist.h
+++ b/src/qtui/playlist.h
@@ -25,29 +25,34 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/playlist.h>
 
-#include "playlist_model.h"
-#include "filter_input.h"
-
+class PlaylistModel;
+class QContextMenuEvent;
+class QMenu;
 class QSortFilterProxyModel;
 
 class PlaylistWidget : public QTreeView
 {
 public:
-    PlaylistWidget (QTreeView * parent = nullptr, int uniqueId = -1);
+    PlaylistWidget (QWidget * parent = nullptr, int uniqueId = -1);
     ~PlaylistWidget ();
+
     void scrollToCurrent ();
     void updatePlaybackIndicator ();
     void update (const Playlist::Update & update);
     void playCurrentIndex ();
-    void deleteCurrentSelection ();
     void setFilter (const QString & text);
-    void toggleQueue ();
+
     int playlist () const;
     int uniqueId () const;
 
+    void setContextMenu (QMenu * menu)
+        { contextMenu = menu; }
+
 private:
     PlaylistModel * model;
     QSortFilterProxyModel * proxyModel;
+    QMenu * contextMenu = nullptr;
+
     int currentPos = -1;
     bool inUpdate = false;
     bool needIndicatorUpdate = false;
@@ -59,8 +64,8 @@ private:
     void getSelectedRanges (const Playlist::Update & update,
      QItemSelection & selected, QItemSelection & deselected);
 
+    void contextMenuEvent (QContextMenuEvent * event);
     void keyPressEvent (QKeyEvent * event);
-    void mousePressEvent (QMouseEvent * event);
     void mouseDoubleClickEvent (QMouseEvent * event);
     void currentChanged (const QModelIndex & current, const QModelIndex & previous);
     void selectionChanged (const QItemSelection & selected, const QItemSelection & deselected);
diff --git a/src/qtui/playlist_model.cc b/src/qtui/playlist_model.cc
index 0d92cfd..7c15a98 100644
--- a/src/qtui/playlist_model.cc
+++ b/src/qtui/playlist_model.cc
@@ -69,7 +69,7 @@ QVariant PlaylistModel::data (const QModelIndex &index, int role) const
         case PL_COL_ARTIST:
         case PL_COL_ALBUM:
         case PL_COL_LENGTH:
-            tuple = aud_playlist_entry_get_tuple (playlist (), index.row (), Playlist::Guess);
+            tuple = aud_playlist_entry_get_tuple (playlist (), index.row (), Playlist::NoWait);
             break;
         }
 
diff --git a/src/qtui/playlist_model.h b/src/qtui/playlist_model.h
index 6c31f41..d2dad2e 100644
--- a/src/qtui/playlist_model.h
+++ b/src/qtui/playlist_model.h
@@ -37,16 +37,21 @@ class PlaylistModel : public QAbstractListModel
 public:
     PlaylistModel (QObject * parent = nullptr, int id = -1);
     ~PlaylistModel ();
+
     int rowCount (const QModelIndex & parent = QModelIndex ()) const;
     int columnCount (const QModelIndex & parent = QModelIndex ()) const;
     QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const;
     QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     bool insertRows (int row, int count, const QModelIndex & parent = QModelIndex ());
     bool removeRows (int row, int count, const QModelIndex & parent = QModelIndex ());
+
     void updateRows (int row, int count);
+
     QString getQueued (int row) const;
     int playlist () const;
     int uniqueId () const;
+
+private:
     int m_uniqueId;
     int m_rows;
 };
diff --git a/src/qtui/playlist_tabs.cc b/src/qtui/playlist_tabs.cc
index 68632c5..cc8a875 100644
--- a/src/qtui/playlist_tabs.cc
+++ b/src/qtui/playlist_tabs.cc
@@ -19,6 +19,7 @@
 
 #include "playlist.h"
 #include "playlist_tabs.h"
+#include "menus.h"
 
 #include <QKeyEvent>
 #include <QLineEdit>
@@ -30,6 +31,7 @@
 
 PlaylistTabs::PlaylistTabs (QWidget * parent) :
     QTabWidget (parent),
+    m_pl_menu (qtui_build_pl_menu (this)),
     m_leftbtn (nullptr),
     m_tabbar (new PlaylistTabBar (this))
 {
@@ -46,6 +48,14 @@ PlaylistTabs::PlaylistTabs (QWidget * parent) :
     connect (this, & QTabWidget::currentChanged, this, & PlaylistTabs::currentChangedTrigger);
 }
 
+PlaylistWidget * PlaylistTabs::createWidget (int list)
+{
+    int id = aud_playlist_get_unique_id (list);
+    auto widget = new PlaylistWidget (this, id);
+    widget->setContextMenu (m_pl_menu);
+    return widget;
+}
+
 void PlaylistTabs::addRemovePlaylists ()
 {
     int tabs = count ();
@@ -83,8 +93,7 @@ void PlaylistTabs::addRemovePlaylists ()
 
             if (! found)
             {
-                int id = aud_playlist_get_unique_id (i);
-                insertTab (i, new PlaylistWidget (0, id), QString ());
+                insertTab (i, createWidget (i), QString ());
                 tabs ++;
             }
         }
@@ -92,8 +101,7 @@ void PlaylistTabs::addRemovePlaylists ()
 
     while (tabs < playlists)
     {
-        int id = aud_playlist_get_unique_id (tabs);
-        addTab (new PlaylistWidget (0, id), QString ());
+        addTab (createWidget (tabs), QString ());
         tabs ++;
     }
 }
@@ -123,16 +131,13 @@ QLineEdit * PlaylistTabs::getTabEdit (int idx)
 
 void PlaylistTabs::setTabTitle (int idx, const char * text)
 {
-    QString title = QString ();
+    // escape ampersands for setTabText ()
+    auto title = QString (text).replace ("&", "&&");
 
     if (aud_get_bool ("qtui", "entry_count_visible"))
-    {
-        title.setNum (aud_playlist_entry_count (idx));
-        title.prepend (" (").append (")");
-    }
+        title += QString (" (%1)").arg (aud_playlist_entry_count (idx));
 
-    // escape ampersands for setTabText ()
-    setTabText (idx, title.prepend (QString (text).replace ("&", "&&")));
+    setTabText (idx, title);
 }
 
 void PlaylistTabs::setupTab (int idx, QWidget * button, const char * text, QWidget * * oldp)
diff --git a/src/qtui/playlist_tabs.h b/src/qtui/playlist_tabs.h
index 1aff1e0..d825068 100644
--- a/src/qtui/playlist_tabs.h
+++ b/src/qtui/playlist_tabs.h
@@ -20,17 +20,16 @@
 #ifndef PLAYLIST_TABS_H
 #define PLAYLIST_TABS_H
 
+#include <QTabBar>
 #include <QTabWidget>
 
 #include <libaudcore/hook.h>
 #include <libaudcore/playlist.h>
 
-#include "playlist.h"
-#include "filter_input.h"
-
 class PlaylistTabBar;
 class PlaylistWidget;
 class QLineEdit;
+class QMenu;
 
 class PlaylistTabs : public QTabWidget
 {
@@ -49,12 +48,14 @@ protected:
     bool eventFilter (QObject * obj, QEvent * e);
 
 private:
+    QMenu * m_pl_menu;
     QWidget * m_leftbtn;
     PlaylistTabBar * m_tabbar;
 
     QLineEdit * getTabEdit (int idx);
     void setTabTitle (int idx, const char * text);
     void setupTab (int idx, QWidget * button, const char * text, QWidget * * oldp);
+    PlaylistWidget * createWidget (int list);
 
     void addRemovePlaylists ();
     void updateTitles ();
diff --git a/src/qtui/qtui.cc b/src/qtui/qtui.cc
index c410cdb..d786b30 100644
--- a/src/qtui/qtui.cc
+++ b/src/qtui/qtui.cc
@@ -19,7 +19,6 @@
 
 #include <QApplication>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
@@ -30,13 +29,22 @@
 #include "main_window.h"
 #include "settings.h"
 
+#include "../ui-common/menu-ops.cc"
+#include "../ui-common/menu-ops-qt.cc"
+
 class QtUI : public audqt::QtIfacePlugin
 {
 private:
     MainWindow * window = nullptr;
 
 public:
-    constexpr QtUI () : audqt::QtIfacePlugin ({N_("Qt Interface"), PACKAGE, nullptr, & qtui_prefs}) {}
+    constexpr QtUI () : audqt::QtIfacePlugin ({
+        N_("Qt Interface"),
+        PACKAGE,
+        nullptr,
+        & qtui_prefs,
+        PluginQtOnly
+    }) {}
 
     bool init ()
     {
diff --git a/src/qtui/status_bar.cc b/src/qtui/status_bar.cc
index 35f4632..4753fc3 100644
--- a/src/qtui/status_bar.cc
+++ b/src/qtui/status_bar.cc
@@ -24,6 +24,8 @@
 #include <libaudcore/i18n.h>
 #include <libaudcore/playlist.h>
 
+#include <QLabel>
+
 StatusBar::StatusBar (QWidget * parent) :
     QStatusBar (parent),
     codec_label (new QLabel (this)),
diff --git a/src/qtui/status_bar.h b/src/qtui/status_bar.h
index 5e2c139..ebd1a63 100644
--- a/src/qtui/status_bar.h
+++ b/src/qtui/status_bar.h
@@ -20,11 +20,12 @@
 #ifndef STATUS_BAR_H
 #define STATUS_BAR_H
 
-#include <QLabel>
 #include <QStatusBar>
 
 #include <libaudcore/hook.h>
 
+class QLabel;
+
 class StatusBar : public QStatusBar
 {
 public:
diff --git a/src/qtui/time_slider.cc b/src/qtui/time_slider.cc
index 8211991..68b850c 100644
--- a/src/qtui/time_slider.cc
+++ b/src/qtui/time_slider.cc
@@ -22,6 +22,10 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 
+#include <QLabel>
+#include <QMouseEvent>
+#include <QStyle>
+
 TimeSlider::TimeSlider (QWidget * parent) :
     QSlider (Qt::Horizontal, parent),
     m_label (new QLabel (parent))
diff --git a/src/qtui/time_slider.h b/src/qtui/time_slider.h
index c6c90f8..d216026 100644
--- a/src/qtui/time_slider.h
+++ b/src/qtui/time_slider.h
@@ -20,13 +20,13 @@
 #ifndef TIME_SLIDER_H
 #define TIME_SLIDER_H
 
-#include <QLabel>
 #include <QSlider>
-#include <QStyle>
-#include <QMouseEvent>
 
 #include <libaudcore/hook.h>
 
+class QLabel;
+class QMouseEvent;
+
 class TimeSlider : public QSlider
 {
 public:
diff --git a/src/scrobbler2/Makefile b/src/scrobbler2/Makefile
index 3bede4e..5180675 100644
--- a/src/scrobbler2/Makefile
+++ b/src/scrobbler2/Makefile
@@ -16,5 +16,5 @@ plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 LD = ${CXX}
 
 CFLAGS += ${PLUGIN_CFLAGS} -Wall
-CPPFLAGS += ${PLUGIN_CPPFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS} ${CURL_CFLAGS} ${XML_CFLAGS} -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${CURL_LIBS} ${XML_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${CURL_CFLAGS} ${XML_CFLAGS} -I../..
+LIBS += ${GLIB_LIBS} ${CURL_LIBS} ${XML_LIBS}
diff --git a/src/scrobbler2/config_window.cc b/src/scrobbler2/config_window.cc
index 2b228f5..374c04b 100644
--- a/src/scrobbler2/config_window.cc
+++ b/src/scrobbler2/config_window.cc
@@ -1,6 +1,7 @@
+//audacious includes
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
 
-//external includes
-#include <gdk/gdk.h>
 //plugin includes
 #include "scrobbler.h"
 
@@ -12,103 +13,49 @@ enum permission perm_result                  = PERMISSION_UNKNOWN;
 String          username;
 
 
-//static (private) variables
-static GtkWidget *button;
-static GtkWidget *revoke_button;
-static GtkWidget *permission_status_icon;
-static GtkWidget *permission_status_label;
-
-static GtkWidget *details_label_first;
-static GtkWidget *url_button;
-static GtkWidget *details_label_second;
-
-static GtkWidget *additional_details_icon;
-static GtkWidget *additional_details_label;
-
-
-static gboolean permission_checker_thread (void * data) {
+static gboolean permission_checker_thread (void *) {
     if (permission_check_requested == true) {
         //the answer hasn't arrived yet
+        hook_call("ui show progress", (void *)N_("Checking Last.fm access ..."));
         return true;
 
     } else {
         //the answer has arrived
+        hook_call("ui hide progress", nullptr);
         g_assert(perm_result != PERMISSION_UNKNOWN);
 
-        if (perm_result == PERMISSION_ALLOWED) {
-            gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "face-smile", GTK_ICON_SIZE_SMALL_TOOLBAR);
-
-            char *markup = g_markup_printf_escaped(_("OK. Scrobbling for user: %s"),
-             (const char *)username);
+        auto msg2 = _("Your scrobbles are being saved on your computer "
+         "temporarily.  They will be submitted as soon as Audacious is "
+         "allowed access.");
 
-            gtk_label_set_markup(GTK_LABEL(permission_status_label), markup);
-            gtk_widget_set_sensitive(revoke_button, true);
-            g_free(markup);
+        if (perm_result == PERMISSION_ALLOWED) {
+            hook_call("ui show info", (void *)(const char *)str_printf
+             (_("Permission granted.  Scrobbling for user %s."),
+             (const char *)username));
 
         } else if (perm_result == PERMISSION_DENIED) {
+            auto msg1 = _("Permission denied.  Open the following "
+             "URL in a browser, allow Audacious access to your account, and "
+             "then click 'Check Permission' again:");
+            auto url = str_printf("http://www.last.fm/api/auth/?api_key=%s"
+             "&token=%s", SCROBBLER_API_KEY, (const char *)request_token);
 
-            gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR);
-            gtk_image_set_from_icon_name(GTK_IMAGE(additional_details_icon), "dialog-information", GTK_ICON_SIZE_SMALL_TOOLBAR);
-
-
-            gtk_label_set_label(GTK_LABEL(permission_status_label), _("Permission Denied"));
-
-            gtk_label_set_markup(GTK_LABEL(details_label_first), _("Access the following link to allow Audacious to scrobble your plays:"));
-
-            char *url = g_markup_printf_escaped("http://www.last.fm/api/auth/?api_key=%s&token=%s",
-             SCROBBLER_API_KEY, (const char *)request_token);
-
-            gtk_link_button_set_uri(GTK_LINK_BUTTON(url_button), url);
-            gtk_button_set_label(GTK_BUTTON(url_button), url);
-            gtk_widget_show(url_button);
-            g_free(url);
-
-            gtk_label_set_markup(GTK_LABEL(details_label_second), _("Keep this window open and click 'Check Permission' again.\n"));
-
-            gtk_label_set_label(GTK_LABEL(additional_details_label),
-                                _("Don't worry. Your scrobbles are saved on your computer.\n"
-                                  "They will be submitted as soon as Audacious is allowed to do so."));
+            hook_call("ui show error", (void *)(const char *)str_concat
+             ({msg1, "\n\n", url, "\n\n", msg2}));
 
         } else if (perm_result == PERMISSION_NONET) {
-            gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
-            gtk_image_set_from_icon_name(GTK_IMAGE(additional_details_icon), "dialog-information", GTK_ICON_SIZE_SMALL_TOOLBAR);
+            auto msg1 = _("There was a problem contacting Last.fm.");
 
-
-            gtk_label_set_label(GTK_LABEL(permission_status_label), _("Network Problem."));
-            gtk_label_set_label(GTK_LABEL(details_label_first),     _("There was a problem contacting Last.fm. Please try again later."));
-            gtk_label_set_label(GTK_LABEL(additional_details_label),
-                    _("Don't worry. Your scrobbles are saved on your computer.\n"
-                      "They will be submitted as soon as Audacious is allowed to do so."));
+            hook_call("ui show error", (void *)(const char *)str_concat
+             ({msg1, "\n\n", msg2}));
         }
 
         perm_result = PERMISSION_UNKNOWN;
-        gtk_widget_set_sensitive(button, true);
-
         return false;
     }
 }
 
-
-static void cleanup_window() {
-    gtk_widget_set_sensitive(button, false);
-    gtk_widget_set_sensitive(revoke_button, false);
-
-    gtk_image_clear(GTK_IMAGE(permission_status_icon));
-    gtk_image_clear(GTK_IMAGE(additional_details_icon));
-
-    gtk_label_set_label(GTK_LABEL(permission_status_label), (""));
-    gtk_label_set_label(GTK_LABEL(details_label_first), "");
-    gtk_widget_hide(url_button);
-    gtk_label_set_label(GTK_LABEL(details_label_second), "");
-    gtk_label_set_label(GTK_LABEL(additional_details_label), "");
-}
-
-static void permission_checker (GtkButton *button12, void * data) {
-    cleanup_window();
-
-    gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "system-run", GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_label_set_label(GTK_LABEL(permission_status_label), _("Checking..."));
-
+static void permission_checker () {
     //This will make the communication thread check the permission
     //and set the current status on the perm_result enum
     permission_check_requested = true;
@@ -123,102 +70,26 @@ static void permission_checker (GtkButton *button12, void * data) {
     pthread_mutex_unlock(&communication_mutex);
 
     //The button is clicked. Wait for the permission check to be done.
-    gdk_threads_add_timeout_seconds(1, permission_checker_thread, data);
+    g_timeout_add(250, permission_checker_thread, nullptr);
 }
 
-static void revoke_permissions (GtkButton *revoke_button2, void * data) {
-    cleanup_window();
-
+static void revoke_permissions () {
     pthread_mutex_lock(&communication_mutex);
     invalidate_session_requested = true;
 
     scrobbling_enabled = false;
     pthread_cond_signal(&communication_signal);
     pthread_mutex_unlock(&communication_mutex);
-
-    gtk_widget_set_sensitive(button, true);
-}
-
-/*
-  ,---config_box---------------------.
-  |                                  |
-  |,-permission_box----------------. |
-  || ,-buttons_box--.              | |
-  || |button        | perm_status  | |
-  || |revoke_button |              | |
-  || `--------------'              | |
-  |`-------------------------------' |
-  |                                  |
-  |,-details_box------------------.  |
-  ||details_label_first           |  |
-  ||url_button                    |  |
-  ||details_label_second          |  |
-  |`------------------------------'  |
-  |                                  |
-  |,-additional_details_box--------. |
-  ||_______________________________| |
-  |__________________________________|
-
- */
-static void *config_status_checker () {
-    GtkWidget *config_box;
-    GtkWidget *permission_box;
-    GtkWidget *buttons_box;
-    GtkWidget *details_box;
-    GtkWidget *additional_details_box;
-
-    config_box              = gtk_vbox_new (false, 15);
-    permission_box          = gtk_hbox_new (false, 0);
-    buttons_box             = gtk_vbutton_box_new ();
-    details_box             = gtk_vbox_new (false, 0);
-    additional_details_box  = gtk_hbox_new (false, 7);
-
-    button                  = gtk_button_new_with_mnemonic(_("C_heck Permission"));
-    revoke_button           = gtk_button_new_with_mnemonic(_("_Revoke Permission"));
-    gtk_widget_set_sensitive(revoke_button, false);
-
-    permission_status_icon  = gtk_image_new();
-    permission_status_label = gtk_label_new("");
-
-    details_label_first  = gtk_label_new ("");
-    url_button           = gtk_link_button_new("");
-    details_label_second = gtk_label_new("");
-
-    gtk_widget_hide(url_button);
-    gtk_widget_set_no_show_all(url_button, true);
-
-    additional_details_icon  = gtk_image_new();
-    additional_details_label = gtk_label_new("");
-
-
-    g_signal_connect (button,        "clicked", G_CALLBACK (permission_checker), nullptr);
-    g_signal_connect (revoke_button, "clicked", G_CALLBACK (revoke_permissions), nullptr);
-
-    gtk_box_pack_start(GTK_BOX(permission_box), buttons_box,             false, false, 20);
-    gtk_box_pack_start(GTK_BOX(permission_box), permission_status_icon,  false, false, 0);
-    gtk_box_pack_start(GTK_BOX(permission_box), permission_status_label, false, false, 5);
-
-    gtk_box_pack_start(GTK_BOX(buttons_box), button,        false, false, 0);
-    gtk_box_pack_start(GTK_BOX(buttons_box), revoke_button, false, false, 0);
-
-    gtk_box_pack_start(GTK_BOX(details_box), details_label_first,  false, false, 0);
-    gtk_box_pack_start(GTK_BOX(details_box), url_button,           false, false, 0);
-    gtk_box_pack_start(GTK_BOX(details_box), details_label_second, false, false, 0);
-
-    gtk_box_pack_start(GTK_BOX(additional_details_box), additional_details_icon,  false, false, 0);
-    gtk_box_pack_start(GTK_BOX(additional_details_box), additional_details_label, false, false, 0);
-
-    gtk_box_pack_start(GTK_BOX(config_box), permission_box,         false, false, 0);
-    gtk_box_pack_start(GTK_BOX(config_box), details_box,            false, false, 0);
-    gtk_box_pack_start(GTK_BOX(config_box), additional_details_box, false, false, 0);
-
-    return config_box;
 }
 
+static const PreferencesWidget buttons[] = {
+    WidgetButton (N_("Check Permission"), {permission_checker}),
+    WidgetButton (N_("Revoke Permission"), {revoke_permissions})
+};
 
 static const PreferencesWidget config_contents[] = {
-    WidgetLabel (N_("You need to allow Audacious to scrobble tracks to your Last.fm account.\n")),
-    WidgetCustomGTK (config_status_checker)
+    WidgetLabel (N_("You need to allow Audacious to scrobble tracks to your Last.fm account.")),
+    WidgetBox ({{buttons}, true})
 };
 
 const PluginPreferences configuration = {{config_contents}};
diff --git a/src/scrobbler2/scrobbler.cc b/src/scrobbler2/scrobbler.cc
index c019595..9c44b94 100644
--- a/src/scrobbler2/scrobbler.cc
+++ b/src/scrobbler2/scrobbler.cc
@@ -139,7 +139,7 @@ static void ended (void *hook_data, void *user_data) {
     //Called when when a track finishes playing.
 
     //TODO: hic sunt race conditions
-    if (playing_track && (g_get_monotonic_time() > (play_started_at + 30*G_USEC_PER_SEC)) ) {
+    if (playing_track.valid() && (g_get_monotonic_time() > (play_started_at + 30*G_USEC_PER_SEC)) ) {
       //This is an odd situation when the track's real length doesn't correspond to the length reported by the player.
       //If we are at the end of the track, it is longer than 30 seconds and it wasn't scrobbled, we scrobble it by then.
 
@@ -185,7 +185,7 @@ static void ready (void *hook_data, void *user_data) {
 }
 
 static void paused (void *hook_data, void *user_data) {
-    if (! playing_track) {
+    if (! playing_track.valid()) {
         //This happens when audacious is started in paused mode
         return;
     }
@@ -202,7 +202,7 @@ static void paused (void *hook_data, void *user_data) {
 
 static void unpaused (void *hook_data, void *user_data) {
 
-    if (! playing_track
+    if (! playing_track.valid()
         || pause_started_at == 0) { //TODO: audacious was started with a paused track.
         return;
     }
diff --git a/src/scrobbler2/scrobbler.h b/src/scrobbler2/scrobbler.h
index aa7db76..9236a31 100644
--- a/src/scrobbler2/scrobbler.h
+++ b/src/scrobbler2/scrobbler.h
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <glib.h>
 #include <libxml/xpath.h>
-#include <gtk/gtk.h>
 
 //audacious includes
 #include <libaudcore/i18n.h>
diff --git a/src/scrobbler2/scrobbler_communication.cc b/src/scrobbler2/scrobbler_communication.cc
index ecc9e64..e6bd579 100644
--- a/src/scrobbler2/scrobbler_communication.cc
+++ b/src/scrobbler2/scrobbler_communication.cc
@@ -48,14 +48,10 @@ static size_t result_callback (void *buffer, size_t size, size_t nmemb, void *us
     return len;
 }
 
-static int param_compare (const API_Parameter & a, const API_Parameter & b, void *)
-{
-    return g_strcmp0 (a.paramName, b.paramName);
-}
-
 static char * scrobbler_get_signature (Index<API_Parameter> & params)
 {
-    params.sort (param_compare, nullptr);
+    params.sort ([] (const API_Parameter & a, const API_Parameter & b)
+        { return g_strcmp0 (a.paramName, b.paramName); });
 
     StringBuf buf (0);
 
diff --git a/src/sdlout/sdlout.cc b/src/sdlout/sdlout.cc
index cc3b379..4a94e24 100644
--- a/src/sdlout/sdlout.cc
+++ b/src/sdlout/sdlout.cc
@@ -27,17 +27,12 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/ringbuf.h>
 #include <libaudcore/runtime.h>
 
 #define VOLUME_RANGE 40 /* decibels */
 
-#define sdlout_error(...) do { \
-    aud_ui_show_error (str_printf ("SDL error: " __VA_ARGS__)); \
-} while (0)
-
 class SDLOutput : public OutputPlugin
 {
 public:
@@ -58,7 +53,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume v);
 
-    bool open_audio (int aud_format, int rate, int chans);
+    bool open_audio (int aud_format, int rate, int chans, String & error);
     void close_audio ();
 
     void period_wait ();
@@ -191,11 +186,11 @@ static void callback (void * user, unsigned char * buf, int len)
     pthread_mutex_unlock (& sdlout_mutex);
 }
 
-bool SDLOutput::open_audio (int format, int rate, int chan)
+bool SDLOutput::open_audio (int format, int rate, int chan, String & error)
 {
     if (format != FMT_S16_NE)
     {
-        sdlout_error ("Only signed 16-bit, native endian audio is supported.\n");
+        error = String ("SDL error: Only signed 16-bit, native endian audio is supported.");
         return false;
     }
 
@@ -220,7 +215,8 @@ bool SDLOutput::open_audio (int format, int rate, int chan)
 
     if (SDL_OpenAudio (& spec, nullptr) < 0)
     {
-        sdlout_error ("Failed to open audio stream: %s.\n", SDL_GetError ());
+        error = String (str_printf
+         ("SDL error: Failed to open audio stream: %s.", SDL_GetError ()));
         buffer.destroy ();
         return false;
     }
diff --git a/src/search-tool-qt/search-tool-qt.cc b/src/search-tool-qt/search-tool-qt.cc
index 7a1f51b..aab0cee 100644
--- a/src/search-tool-qt/search-tool-qt.cc
+++ b/src/search-tool-qt/search-tool-qt.cc
@@ -30,7 +30,6 @@
 #include <QPushButton>
 #include <QTreeView>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
@@ -50,7 +49,10 @@ class SearchToolQt : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Search Tool"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr SearchToolQt () : GeneralPlugin (info, false) {}
@@ -225,17 +227,20 @@ static int get_playlist (bool require_added, bool require_scanned)
     return list;
 }
 
-static String get_path ()
+static String get_uri ()
 {
+    auto to_uri = [] (const char * path)
+        { return String (filename_to_uri (path)); };
+
     String path1 = aud_get_str ("search-tool", "path");
-    if (g_file_test (path1, G_FILE_TEST_EXISTS))
-        return path1;
+    if (path1[0])
+        return strstr (path1, "://") ? path1 : to_uri (path1);
 
     StringBuf path2 = filename_build ({g_get_home_dir (), "Music"});
     if (g_file_test (path2, G_FILE_TEST_EXISTS))
-        return String (path2);
+        return to_uri (path2);
 
-    return String (g_get_home_dir ());
+    return to_uri (g_get_home_dir ());
 }
 
 static void destroy_database ()
@@ -254,7 +259,7 @@ static void create_database (int list)
 
     for (int e = 0; e < entries; e ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (list, e, Playlist::Nothing);
+        Tuple tuple = aud_playlist_entry_get_tuple (list, e, Playlist::NoWait);
 
         aud::array<SearchField, String> fields;
         fields[SearchField::Genre] = tuple.get_str (Tuple::Genre);
@@ -317,7 +322,7 @@ static void search_cb (const Key & key, Item & item, void * _state)
     state->mask = oldmask;
 }
 
-static int item_compare (const Item * const & a, const Item * const & b, void *)
+static int item_compare (const Item * const & a, const Item * const & b)
 {
     if (a->field < b->field)
         return -1;
@@ -329,19 +334,19 @@ static int item_compare (const Item * const & a, const Item * const & b, void *)
         return val;
 
     if (a->parent)
-        return b->parent ? item_compare (a->parent, b->parent, nullptr) : 1;
+        return b->parent ? item_compare (a->parent, b->parent) : 1;
     else
         return b->parent ? -1 : 0;
 }
 
-static int item_compare_pass1 (const Item * const & a, const Item * const & b, void *)
+static int item_compare_pass1 (const Item * const & a, const Item * const & b)
 {
     if (a->matches.len () > b->matches.len ())
         return -1;
     if (a->matches.len () < b->matches.len ())
         return 1;
 
-    return item_compare (a, b, nullptr);
+    return item_compare (a, b);
 }
 
 static void do_search ()
@@ -362,7 +367,7 @@ static void do_search ()
     items = std::move (state.items);
 
     /* first sort by number of songs per item */
-    items.sort (item_compare_pass1, nullptr);
+    items.sort (item_compare_pass1);
 
     /* limit to items with most songs */
     if (items.len () > MAX_RESULTS)
@@ -372,18 +377,29 @@ static void do_search ()
     }
 
     /* sort by item type, then item name */
-    items.sort (item_compare, nullptr);
+    items.sort (item_compare);
 }
 
 static bool filter_cb (const char * filename, void * unused)
 {
+    bool add = false;
     tiny_lock (& adding_lock);
-    bool add = adding && ! added_table.lookup (String (filename));
+
+    if (adding)
+    {
+        bool * added = added_table.lookup (String (filename));
+
+        if ((add = ! added))
+            added_table.add (String (filename), true);
+        else
+            (* added) = true;
+    }
+
     tiny_unlock (& adding_lock);
     return add;
 }
 
-static void begin_add (const char * path)
+static void begin_add (const char * uri)
 {
     if (adding)
         return;
@@ -393,13 +409,9 @@ static void begin_add (const char * path)
     if (list < 0)
         list = create_playlist ();
 
-    aud_set_str ("search-tool", "path", path);
-
-    StringBuf uri = filename_to_uri (path);
-    g_return_if_fail (uri);
-
-    if (! g_str_has_suffix (uri, "/"))
-        uri.insert (-1, "/");
+    /* if possible, store local path for compatibility with older versions */
+    StringBuf path = uri_to_filename (uri);
+    aud_set_str ("search-tool", "path", path ? path : uri);
 
     added_table.clear ();
 
@@ -409,17 +421,16 @@ static void begin_add (const char * path)
     {
         String filename = aud_playlist_entry_get_filename (list, entry);
 
-        if (g_str_has_prefix (filename, uri) && ! added_table.lookup (filename))
+        if (! added_table.lookup (filename))
         {
             aud_playlist_entry_set_selected (list, entry, false);
-            added_table.add (filename, true);
+            added_table.add (filename, false);
         }
         else
             aud_playlist_entry_set_selected (list, entry, true);
     }
 
     aud_playlist_delete_selected (list);
-    aud_playlist_remove_failed (list);
 
     tiny_lock (& adding_lock);
     adding = true;
@@ -518,7 +529,24 @@ static void add_complete_cb (void * unused, void * unused2)
         adding = false;
         tiny_unlock (& adding_lock);
 
+        int entries = aud_playlist_entry_count (list);
+
+        for (int entry = 0; entry < entries; entry ++)
+        {
+            String filename = aud_playlist_entry_get_filename (list, entry);
+            bool * added = added_table.lookup (filename);
+
+            aud_playlist_entry_set_selected (list, entry, ! added || ! (* added));
+        }
+
         added_table.clear ();
+
+        /* don't clear the playlist if nothing was added */
+        if (aud_playlist_selected_count (list) < aud_playlist_entry_count (list))
+            aud_playlist_delete_selected (list);
+        else
+            aud_playlist_select_all (list, false);
+
         aud_playlist_sort_by_scheme (list, Playlist::Path);
     }
 
@@ -606,7 +634,8 @@ static void do_add (bool play, bool set_title)
         {
             add.append (
                 aud_playlist_entry_get_filename (list, entry),
-                aud_playlist_entry_get_tuple (list, entry, Playlist::Nothing)
+                aud_playlist_entry_get_tuple (list, entry, Playlist::NoWait),
+                aud_playlist_entry_get_decoder (list, entry, Playlist::NoWait)
             );
         }
 
@@ -624,14 +653,7 @@ static void do_add (bool play, bool set_title)
 
 static void action_play ()
 {
-    int list = aud_playlist_get_temporary ();
-    aud_playlist_set_active (list);
-
-    if (aud_get_bool (nullptr, "clear_playlist"))
-        aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
-    else
-        aud_playlist_queue_delete (list, 0, aud_playlist_queue_count (list));
-
+    aud_playlist_set_active (aud_playlist_get_temporary ());
     do_add (true, false);
 }
 
@@ -734,9 +756,9 @@ void * SearchToolQt::get_qt_widget ()
     button->setFlat (true);
     hbox->addWidget (button);
 
-    char * utf8 = g_filename_to_utf8 (get_path (), -1, nullptr, nullptr, nullptr);
-    chooser->setText (utf8);
-    g_free (utf8);
+    String uri = get_uri ();
+    StringBuf path = uri_to_filename (uri, false);
+    chooser->setText (path ? path : uri);
 
     search_init ();
 
@@ -751,19 +773,20 @@ void * SearchToolQt::get_qt_widget ()
         search_pending = true;
     });
 
-    QObject::connect (button, & QPushButton::clicked, [chooser] ()
-    {
-        char * path = g_filename_from_utf8 (chooser->text ().toUtf8 (), -1,
-         nullptr, nullptr, nullptr);
+    QObject::connect (chooser, & QLineEdit::textEdited, [button] (const QString & text)
+        { button->setDisabled (text.isEmpty ()); });
 
-        if (path && path[0])
+    auto refresh = [chooser] () {
+        QByteArray path = chooser->text ().toUtf8 ();
+        if (! path.isEmpty ())
         {
-            begin_add (path);
+            begin_add (strstr (path, "://") ? path : filename_to_uri (path));
             update_database ();
         }
+    };
 
-        g_free (path);
-    });
+    QObject::connect (chooser, & QLineEdit::returnPressed, refresh);
+    QObject::connect (button, & QPushButton::clicked, refresh);
 
     return widget;
 }
diff --git a/src/search-tool/search-tool.cc b/src/search-tool/search-tool.cc
index 4f8398e..4f1add1 100644
--- a/src/search-tool/search-tool.cc
+++ b/src/search-tool/search-tool.cc
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
@@ -41,7 +40,10 @@ class SearchTool : public GeneralPlugin
 public:
     static constexpr PluginInfo info = {
         N_("Search Tool"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr SearchTool () : GeneralPlugin (info, false) {}
@@ -158,17 +160,20 @@ static int get_playlist (bool require_added, bool require_scanned)
     return list;
 }
 
-static String get_path ()
+static String get_uri ()
 {
+    auto to_uri = [] (const char * path)
+        { return String (filename_to_uri (path)); };
+
     String path1 = aud_get_str ("search-tool", "path");
-    if (g_file_test (path1, G_FILE_TEST_EXISTS))
-        return path1;
+    if (path1[0])
+        return strstr (path1, "://") ? path1 : to_uri (path1);
 
     StringBuf path2 = filename_build ({g_get_home_dir (), "Music"});
     if (g_file_test (path2, G_FILE_TEST_EXISTS))
-        return String (path2);
+        return to_uri (path2);
 
-    return String (g_get_home_dir ());
+    return to_uri (g_get_home_dir ());
 }
 
 static void destroy_database ()
@@ -187,7 +192,7 @@ static void create_database (int list)
 
     for (int e = 0; e < entries; e ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (list, e, Playlist::Nothing);
+        Tuple tuple = aud_playlist_entry_get_tuple (list, e, Playlist::NoWait);
 
         aud::array<SearchField, String> fields;
         fields[SearchField::Genre] = tuple.get_str (Tuple::Genre);
@@ -250,7 +255,7 @@ static void search_cb (const Key & key, Item & item, void * _state)
     state->mask = oldmask;
 }
 
-static int item_compare (const Item * const & a, const Item * const & b, void *)
+static int item_compare (const Item * const & a, const Item * const & b)
 {
     if (a->field < b->field)
         return -1;
@@ -262,19 +267,19 @@ static int item_compare (const Item * const & a, const Item * const & b, void *)
         return val;
 
     if (a->parent)
-        return b->parent ? item_compare (a->parent, b->parent, nullptr) : 1;
+        return b->parent ? item_compare (a->parent, b->parent) : 1;
     else
         return b->parent ? -1 : 0;
 }
 
-static int item_compare_pass1 (const Item * const & a, const Item * const & b, void *)
+static int item_compare_pass1 (const Item * const & a, const Item * const & b)
 {
     if (a->matches.len () > b->matches.len ())
         return -1;
     if (a->matches.len () < b->matches.len ())
         return 1;
 
-    return item_compare (a, b, nullptr);
+    return item_compare (a, b);
 }
 
 static void do_search ()
@@ -295,7 +300,7 @@ static void do_search ()
     items = std::move (state.items);
 
     /* first sort by number of songs per item */
-    items.sort (item_compare_pass1, nullptr);
+    items.sort (item_compare_pass1);
 
     /* limit to items with most songs */
     if (items.len () > MAX_RESULTS)
@@ -305,7 +310,7 @@ static void do_search ()
     }
 
     /* sort by item type, then item name */
-    items.sort (item_compare, nullptr);
+    items.sort (item_compare);
 
     selection.remove (0, -1);
     selection.insert (0, items.len ());
@@ -315,13 +320,24 @@ static void do_search ()
 
 static bool filter_cb (const char * filename, void * unused)
 {
+    bool add = false;
     tiny_lock (& adding_lock);
-    bool add = adding && ! added_table.lookup (String (filename));
+
+    if (adding)
+    {
+        bool * added = added_table.lookup (String (filename));
+
+        if ((add = ! added))
+            added_table.add (String (filename), true);
+        else
+            (* added) = true;
+    }
+
     tiny_unlock (& adding_lock);
     return add;
 }
 
-static void begin_add (const char * path)
+static void begin_add (const char * uri)
 {
     if (adding)
         return;
@@ -331,13 +347,9 @@ static void begin_add (const char * path)
     if (list < 0)
         list = create_playlist ();
 
-    aud_set_str ("search-tool", "path", path);
-
-    StringBuf uri = filename_to_uri (path);
-    g_return_if_fail (uri);
-
-    if (! g_str_has_suffix (uri, "/"))
-        uri.insert (-1, "/");
+    /* if possible, store local path for compatibility with older versions */
+    StringBuf path = uri_to_filename (uri);
+    aud_set_str ("search-tool", "path", path ? path : uri);
 
     added_table.clear ();
 
@@ -347,17 +359,16 @@ static void begin_add (const char * path)
     {
         String filename = aud_playlist_entry_get_filename (list, entry);
 
-        if (g_str_has_prefix (filename, uri) && ! added_table.lookup (filename))
+        if (! added_table.lookup (filename))
         {
             aud_playlist_entry_set_selected (list, entry, false);
-            added_table.add (filename, true);
+            added_table.add (filename, false);
         }
         else
             aud_playlist_entry_set_selected (list, entry, true);
     }
 
     aud_playlist_delete_selected (list);
-    aud_playlist_remove_failed (list);
 
     tiny_lock (& adding_lock);
     adding = true;
@@ -451,7 +462,24 @@ static void add_complete_cb (void * unused, void * unused2)
         adding = false;
         tiny_unlock (& adding_lock);
 
+        int entries = aud_playlist_entry_count (list);
+
+        for (int entry = 0; entry < entries; entry ++)
+        {
+            String filename = aud_playlist_entry_get_filename (list, entry);
+            bool * added = added_table.lookup (filename);
+
+            aud_playlist_entry_set_selected (list, entry, ! added || ! (* added));
+        }
+
         added_table.clear ();
+
+        /* don't clear the playlist if nothing was added */
+        if (aud_playlist_selected_count (list) < aud_playlist_entry_count (list))
+            aud_playlist_delete_selected (list);
+        else
+            aud_playlist_select_all (list, false);
+
         aud_playlist_sort_by_scheme (list, Playlist::Path);
     }
 
@@ -536,7 +564,8 @@ static void do_add (bool play, bool set_title)
         {
             add.append (
                 aud_playlist_entry_get_filename (list, entry),
-                aud_playlist_entry_get_tuple (list, entry, Playlist::Nothing)
+                aud_playlist_entry_get_tuple (list, entry, Playlist::NoWait),
+                aud_playlist_entry_get_decoder (list, entry, Playlist::NoWait)
             );
         }
 
@@ -554,14 +583,7 @@ static void do_add (bool play, bool set_title)
 
 static void action_play ()
 {
-    int list = aud_playlist_get_temporary ();
-    aud_playlist_set_active (list);
-
-    if (aud_get_bool (nullptr, "clear_playlist"))
-        aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
-    else
-        aud_playlist_queue_delete (list, 0, aud_playlist_queue_count (list));
-
+    aud_playlist_set_active (aud_playlist_get_temporary ());
     do_add (true, false);
 }
 
@@ -647,13 +669,53 @@ static void list_right_click (void * user, GdkEventButton * event)
     gtk_menu_popup ((GtkMenu *) menu, nullptr, nullptr, nullptr, nullptr, event->button, event->time);
 }
 
+static Index<char> list_get_data (void * user)
+{
+    if (search_pending)
+        search_timeout ();
+
+    int list = aud_playlist_by_unique_id (playlist_id);
+    int n_items = items.len ();
+
+    Index<char> buf;
+
+    aud_playlist_select_all (playlist_id, false);
+
+    for (int i = 0; i < n_items; i ++)
+    {
+        if (! selection[i])
+            continue;
+
+        const Item * item = items[i];
+
+        for (int entry : item->matches)
+        {
+            if (buf.len ())
+                buf.append ('\n');
+
+            String filename = aud_playlist_entry_get_filename (list, entry);
+            buf.insert (filename, -1, strlen (filename));
+
+            aud_playlist_entry_set_selected (list, entry, true);
+        }
+    }
+
+    aud_playlist_cache_selected (list);
+
+    return buf;
+}
+
 static const AudguiListCallbacks list_callbacks = {
     list_get_value,
     list_get_selected,
     list_set_selected,
     list_select_all,
     list_activate_row,
-    list_right_click
+    list_right_click,
+    nullptr,  // shift_rows
+    "text/uri-list",
+    list_get_data,
+    nullptr  // receive_data
 };
 
 static void entry_cb (GtkEntry * entry, void * unused)
@@ -664,13 +726,21 @@ static void entry_cb (GtkEntry * entry, void * unused)
     search_pending = true;
 }
 
-static void refresh_cb (GtkButton * button, GtkWidget * chooser)
+static void file_entry_cb (GtkEntry * entry, GtkWidget * button)
 {
-    char * path = gtk_file_chooser_get_filename ((GtkFileChooser *) chooser);
-    begin_add (path);
-    g_free (path);
+    const char * text = gtk_entry_get_text ((GtkEntry *) entry);
+    gtk_widget_set_sensitive (button, text[0] != 0);
+}
 
-    update_database ();
+static void refresh_cb (GtkButton * button, GtkWidget * file_entry)
+{
+    String uri = audgui_file_entry_get_uri (file_entry);
+    if (uri)
+    {
+        audgui_file_entry_set_uri (file_entry, uri);  // normalize path
+        begin_add (uri);
+        update_database ();
+    }
 }
 
 void * SearchTool::get_gtk_widget ()
@@ -719,11 +789,11 @@ void * SearchTool::get_gtk_widget ()
     GtkWidget * hbox = gtk_hbox_new (false, 6);
     gtk_box_pack_end ((GtkBox *) vbox, hbox, false, false, 0);
 
-    GtkWidget * chooser = gtk_file_chooser_button_new (_("Choose Folder"),
-     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_box_pack_start ((GtkBox *) hbox, chooser, true, true, 0);
+    GtkWidget * file_entry = audgui_file_entry_new
+     (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("Choose Folder"));
+    gtk_box_pack_start ((GtkBox *) hbox, file_entry, true, true, 0);
 
-    gtk_file_chooser_set_filename ((GtkFileChooser *) chooser, get_path ());
+    audgui_file_entry_set_uri (file_entry, get_uri ());
 
     GtkWidget * button = gtk_button_new ();
     gtk_container_add ((GtkContainer *) button, gtk_image_new_from_icon_name
@@ -736,7 +806,9 @@ void * SearchTool::get_gtk_widget ()
     g_signal_connect (vbox, "destroy", (GCallback) search_cleanup, nullptr);
     g_signal_connect (entry, "changed", (GCallback) entry_cb, nullptr);
     g_signal_connect (entry, "activate", (GCallback) action_play, nullptr);
-    g_signal_connect (button, "clicked", (GCallback) refresh_cb, chooser);
+    g_signal_connect (file_entry, "changed", (GCallback) file_entry_cb, button);
+    g_signal_connect (file_entry, "activate", (GCallback) refresh_cb, file_entry);
+    g_signal_connect (button, "clicked", (GCallback) refresh_cb, file_entry);
 
     gtk_widget_show_all (vbox);
     gtk_widget_show (results_list);
diff --git a/src/sid/xmms-sid.cc b/src/sid/xmms-sid.cc
index f1f59e9..e38f040 100644
--- a/src/sid/xmms-sid.cc
+++ b/src/sid/xmms-sid.cc
@@ -46,20 +46,25 @@ public:
         & sid_prefs
     };
 
-    static constexpr auto iinfo = InputInfo(FlagSubtunes)
+    constexpr SIDPlugin() : InputPlugin(info, InputInfo(FlagSubtunes)
         .with_priority(5) /* medium priority (slow to initialize) */
-        .with_exts(exts);
+        .with_exts(exts)) {}
 
-    constexpr SIDPlugin() : InputPlugin(info, iinfo) {}
+    bool init()
+    {
+        xs_init_configuration();
+        return true;
+    }
 
-    bool delayed_init();
     void cleanup();
 
     bool is_our_file(const char *filename, VFSFile &file);
-    Tuple read_tuple(const char *filename, VFSFile &file);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
     bool play(const char *filename, VFSFile &file);
 
 private:
+    bool delayed_init();
+
     pthread_mutex_t m_init_mutex = PTHREAD_MUTEX_INITIALIZER;
     bool m_initialized = false;
     bool m_init_failed = false;
@@ -78,9 +83,6 @@ bool SIDPlugin::delayed_init()
 
     if (!m_initialized && !m_init_failed)
     {
-        /* Initialize and get configuration */
-        xs_init_configuration();
-
         /* Try to initialize emulator engine */
         m_initialized = xs_sidplayfp_init();
         if (!m_initialized)
@@ -136,7 +138,7 @@ bool SIDPlugin::play(const char *filename, VFSFile &file)
 
     /* Get tune information */
     xs_tuneinfo_t info;
-    if (!xs_sidplayfp_getinfo(info, filename, buf.begin(), buf.len()))
+    if (!xs_sidplayfp_getinfo(info, buf.begin(), buf.len()))
         return false;
 
     /* Initialize the tune */
@@ -160,18 +162,10 @@ bool SIDPlugin::play(const char *filename, VFSFile &file)
     /* Initialize song */
     if (!xs_sidplayfp_initsong(subTune)) {
         AUDERR("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
-            (const char *) info.sidFilename, subTune);
+            filename, subTune);
         return false;
     }
 
-    /* Set song information for current subtune */
-    xs_sidplayfp_updateinfo(info, subTune);
-
-    Tuple tmpTuple;
-    tmpTuple.set_filename(info.sidFilename);
-    xs_get_song_tuple_info(tmpTuple, info, subTune);
-    set_playback_tuple(std::move(tmpTuple));
-
     /* Open the audio output */
     open_audio(FMT_S16_NE, xs_cfg.audioFrequency, xs_cfg.audioChannels);
 
@@ -230,16 +224,6 @@ static void xs_get_song_tuple_info(Tuple &tuple, const xs_tuneinfo_t &info, int
     tuple.set_str (Tuple::Copyright, info.sidCopyright);
     tuple.set_str (Tuple::Codec, info.sidFormat);
 
-#if 0
-    switch (info.sidModel) {
-        case XS_SIDMODEL_6581: tmpStr = "6581"; break;
-        case XS_SIDMODEL_8580: tmpStr = "8580"; break;
-        case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
-        default: tmpStr = "?"; break;
-    }
-    tuple_set_str(tuple, -1, "sid-model", tmpStr);
-#endif
-
     /* Get sub-tune information, if available */
     if (subTune < 0 || info.startTune > info.nsubTunes)
         subTune = info.startTune;
@@ -247,26 +231,6 @@ static void xs_get_song_tuple_info(Tuple &tuple, const xs_tuneinfo_t &info, int
     if (subTune > 0 && subTune <= info.nsubTunes) {
         int tmpInt = info.subTunes[subTune - 1].tuneLength;
         tuple.set_int (Tuple::Length, (tmpInt < 0) ? -1 : tmpInt * 1000);
-
-#if 0
-        tmpInt = info.subTunes[subTune - 1].tuneSpeed;
-        if (tmpInt > 0) {
-            switch (tmpInt) {
-            case XS_CLOCK_PAL: tmpStr = "PAL"; break;
-            case XS_CLOCK_NTSC: tmpStr = "NTSC"; break;
-            case XS_CLOCK_ANY: tmpStr = "ANY"; break;
-            case XS_CLOCK_VBI: tmpStr = "VBI"; break;
-            case XS_CLOCK_CIA: tmpStr = "CIA"; break;
-            default:
-                snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
-                tmpStr = tmpStr2;
-                break;
-            }
-        } else
-            tmpStr = "?";
-
-        tuple_set_str(tuple, -1, "sid-speed", tmpStr);
-#endif
     } else
         subTune = 1;
 
@@ -278,7 +242,7 @@ static void xs_get_song_tuple_info(Tuple &tuple, const xs_tuneinfo_t &info, int
 
 static void xs_fill_subtunes(Tuple &tuple, const xs_tuneinfo_t &info)
 {
-    Index<int> subtunes;
+    Index<short> subtunes;
 
     for (int count = 0; count < info.nsubTunes; count++) {
         if (count + 1 == info.startTune || !xs_cfg.subAutoMinOnly ||
@@ -290,34 +254,29 @@ static void xs_fill_subtunes(Tuple &tuple, const xs_tuneinfo_t &info)
     tuple.set_subtunes (subtunes.len (), subtunes.begin ());
 }
 
-Tuple SIDPlugin::read_tuple(const char *filename, VFSFile &file)
+bool SIDPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-    Tuple tuple;
-
     if (!delayed_init())
-        return tuple;
-
-    xs_tuneinfo_t info;
-    int tune = -1;
+        return false;
 
     Index<char> buf = file.read_all ();
     if (!xs_sidplayfp_probe(buf.begin(), buf.len()))
-        return tuple;
+        return false;
 
     /* Get information from URL */
-    tuple.set_filename (filename);
-    tune = tuple.get_int (Tuple::Subtune);
+    int tune = tuple.get_int (Tuple::Subtune);
 
     /* Get tune information from emulation engine */
-    if (!xs_sidplayfp_getinfo(info, filename, buf.begin(), buf.len()))
-        return tuple;
+    xs_tuneinfo_t info;
+    if (!xs_sidplayfp_getinfo(info, buf.begin(), buf.len()))
+        return false;
 
     xs_get_song_tuple_info(tuple, info, tune);
 
     if (xs_cfg.subAutoEnable && info.nsubTunes > 1 && tune < 0)
         xs_fill_subtunes(tuple, info);
 
-    return tuple;
+    return true;
 }
 
 /*
diff --git a/src/sid/xmms-sid.h b/src/sid/xmms-sid.h
index 13553ee..3018e64 100644
--- a/src/sid/xmms-sid.h
+++ b/src/sid/xmms-sid.h
@@ -37,13 +37,11 @@
 /* Plugin-wide typedefs
  */
 typedef struct {
-    int tuneSpeed = -1;
     int tuneLength = -1;
 } xs_subtuneinfo_t;
 
 typedef struct {
-    String sidFilename, sidName, sidComposer, sidCopyright, sidFormat;
-    int loadAddr, initAddr, playAddr, dataFileLen, sidModel;
+    String sidName, sidComposer, sidCopyright, sidFormat;
     int nsubTunes, startTune;
     Index<xs_subtuneinfo_t> subTunes;
 } xs_tuneinfo_t;
diff --git a/src/sid/xs_sidplay2.cc b/src/sid/xs_sidplay2.cc
index 1564fe6..a30af8e 100644
--- a/src/sid/xs_sidplay2.cc
+++ b/src/sid/xs_sidplay2.cc
@@ -226,7 +226,7 @@ bool xs_sidplayfp_load(const void *buf, int64_t bufSize)
 }
 
 
-bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *buf, int64_t bufSize)
+bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const void *buf, int64_t bufSize)
 {
     /* Check if the tune exists and is readable */
     SidTune myTune((const uint8_t*)buf, bufSize);
@@ -238,8 +238,6 @@ bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *b
     const SidTuneInfo *myInfo = myTune.getInfo();
 
     /* Allocate tuneinfo structure and set information */
-    ti.sidFilename = String (filename);
-
     ti.sidName = String (myInfo->infoString(0));
     ti.sidComposer = String (myInfo->infoString(1));
     ti.sidCopyright = String (myInfo->infoString(2));
@@ -247,14 +245,8 @@ bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *b
     ti.nsubTunes = myInfo->songs();
     ti.startTune = myInfo->startSong();
 
-    ti.loadAddr = myInfo->loadAddr();
-    ti.initAddr = myInfo->initAddr();
-    ti.playAddr = myInfo->playAddr();
-    ti.dataFileLen = myInfo->dataFileLen();
     ti.sidFormat = String (myInfo->formatString());
 
-    ti.sidModel = myInfo->sidModel1();
-
     /* Fill in subtune information */
     ti.subTunes.insert(0, ti.nsubTunes);
 
@@ -273,50 +265,3 @@ bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *b
 
     return true;
 }
-
-bool xs_sidplayfp_updateinfo(xs_tuneinfo_t &ti, int subtune)
-{
-    /* Get currently playing tune information */
-    const SidTuneInfo *myInfo = state.currTune->getInfo();
-
-    /* NOTICE! Here we assume that libSIDPlay[12] headers define
-     * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
-     */
-    ti.sidModel = myInfo->sidModel1();
-
-    if ((subtune > 0) && (subtune <= ti.nsubTunes)) {
-        int tmpSpeed = -1;
-
-        switch (myInfo->clockSpeed()) {
-        case SidTuneInfo::CLOCK_PAL:
-            tmpSpeed = XS_CLOCK_PAL;
-            break;
-        case SidTuneInfo::CLOCK_NTSC:
-            tmpSpeed = XS_CLOCK_NTSC;
-            break;
-        case SidTuneInfo::CLOCK_ANY:
-            tmpSpeed = XS_CLOCK_ANY;
-            break;
-        case SidTuneInfo::CLOCK_UNKNOWN:
-            switch (myInfo->songSpeed()) {
-            case SidTuneInfo::SPEED_VBI:
-                tmpSpeed = XS_CLOCK_VBI;
-                break;
-            case SidTuneInfo::SPEED_CIA_1A:
-                tmpSpeed = XS_CLOCK_CIA;
-                break;
-            default:
-                tmpSpeed = myInfo->songSpeed();
-                break;
-            }
-            break;
-        default:
-            tmpSpeed = myInfo->clockSpeed();
-            break;
-        }
-
-        ti.subTunes[subtune - 1].tuneSpeed = tmpSpeed;
-    }
-
-    return true;
-}
diff --git a/src/sid/xs_sidplay2.h b/src/sid/xs_sidplay2.h
index 9e0dac8..1e42418 100644
--- a/src/sid/xs_sidplay2.h
+++ b/src/sid/xs_sidplay2.h
@@ -11,7 +11,6 @@ bool xs_sidplayfp_init();
 bool xs_sidplayfp_initsong(int subtune);
 unsigned xs_sidplayfp_fillbuffer(char *, unsigned);
 bool xs_sidplayfp_load(const void *buf, int64_t bufSize);
-bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *buf, int64_t bufSize);
-bool xs_sidplayfp_updateinfo(xs_tuneinfo_t &ti, int subtune);
+bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const void *buf, int64_t bufSize);
 
 #endif /* XS_SIDPLAYFP_H */
diff --git a/src/skins-qt/actions-playlist.h b/src/skins-qt/actions-playlist.h
index 8f530b4..0842482 100644
--- a/src/skins-qt/actions-playlist.h
+++ b/src/skins-qt/actions-playlist.h
@@ -20,64 +20,13 @@
 #ifndef SKINS_ACTIONS_PLAYLIST_H
 #define SKINS_ACTIONS_PLAYLIST_H
 
-void action_playlist_refresh_list ();
-
-void action_playlist_play ();
-void action_playlist_new ();
-void action_playlist_prev ();
-void action_playlist_next ();
 void action_playlist_rename ();
 void action_playlist_delete ();
 
-void action_playlist_invert_selection ();
-void action_playlist_select_all ();
-void action_playlist_select_none ();
-
-void action_playlist_clear_queue ();
-void action_playlist_remove_unavailable ();
-void action_playlist_remove_dupes_by_title ();
-void action_playlist_remove_dupes_by_filename ();
-void action_playlist_remove_dupes_by_full_path ();
-void action_playlist_remove_all ();
-void action_playlist_remove_selected ();
-void action_playlist_remove_unselected ();
-
-void action_playlist_copy ();
-void action_playlist_cut ();
-void action_playlist_paste ();
+void action_playlist_search_and_select ();
 
 void action_playlist_add_url ();
 void action_playlist_add_files ();
 void action_playlist_add_folder ();
 
-void action_playlist_randomize_list ();
-void action_playlist_reverse_list ();
-
-void action_playlist_sort_by_title ();
-void action_playlist_sort_by_album ();
-void action_playlist_sort_by_artist ();
-void action_playlist_sort_by_album_artist ();
-void action_playlist_sort_by_length ();
-void action_playlist_sort_by_genre ();
-void action_playlist_sort_by_filename ();
-void action_playlist_sort_by_full_path ();
-void action_playlist_sort_by_date ();
-void action_playlist_sort_by_track_number ();
-void action_playlist_sort_by_custom_title ();
-
-void action_playlist_sort_selected_by_title ();
-void action_playlist_sort_selected_by_album ();
-void action_playlist_sort_selected_by_artist ();
-void action_playlist_sort_selected_by_album_artist ();
-void action_playlist_sort_selected_by_length ();
-void action_playlist_sort_selected_by_genre ();
-void action_playlist_sort_selected_by_filename ();
-void action_playlist_sort_selected_by_full_path ();
-void action_playlist_sort_selected_by_date ();
-void action_playlist_sort_selected_by_track_number ();
-void action_playlist_sort_selected_by_custom_title ();
-
-void action_playlist_track_info ();
-void action_queue_toggle ();
-
 #endif /* SKINS_ACTIONS_PLAYLIST_H */
diff --git a/src/skins-qt/actions.cc b/src/skins-qt/actions.cc
index 3b2695d..a01db44 100644
--- a/src/skins-qt/actions.cc
+++ b/src/skins-qt/actions.cc
@@ -28,6 +28,8 @@
 #include "main.h"
 #include "plugin-window.h"
 
+#include "../ui-common/menu-ops.h"
+
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/playlist.h>
@@ -92,204 +94,14 @@ void action_search_tool ()
     }
 }
 
-void action_playlist_refresh_list ()
-    { aud_playlist_rescan (ACTIVE); }
-void action_playlist_play ()
-    { aud_playlist_play (ACTIVE); }
-
-void action_playlist_new ()
-{
-    int playlist = aud_playlist_get_active () + 1;
-    aud_playlist_insert (playlist);
-    aud_playlist_set_active (playlist);
-}
-
-void action_playlist_prev ()
-{
-    int playlist = ACTIVE;
-    if (playlist > 0)
-        aud_playlist_set_active (playlist - 1);
-    else
-    {
-        int count = aud_playlist_count ();
-        if (count > 1)
-            aud_playlist_set_active (count - 1);
-    }
-}
-
-void action_playlist_next ()
-{
-    int playlist = ACTIVE;
-    int count = aud_playlist_count ();
-    if (playlist + 1 < count)
-        aud_playlist_set_active (playlist + 1);
-    else if (count > 1)
-        aud_playlist_set_active (0);
-}
-
 void action_playlist_rename ()
     { audqt::playlist_show_rename (ACTIVE); }
 void action_playlist_delete ()
     { audqt::playlist_confirm_delete (ACTIVE); }
 
-void action_playlist_invert_selection ()
-{
-    int playlist = ACTIVE;
-    int entries = aud_playlist_entry_count (playlist);
-    for (int entry = 0; entry < entries; entry ++)
-        aud_playlist_entry_set_selected (playlist, entry,
-         ! aud_playlist_entry_get_selected (playlist, entry));
-}
-
-void action_playlist_select_all ()
-    { aud_playlist_select_all (ACTIVE, true); }
-void action_playlist_select_none ()
-    { aud_playlist_select_all (ACTIVE, false); }
-
-void action_playlist_clear_queue ()
-{
-    int playlist = ACTIVE;
-    aud_playlist_queue_delete (playlist, 0, aud_playlist_queue_count (playlist));
-}
-
-void action_playlist_remove_unavailable ()
-    { aud_playlist_remove_failed (ACTIVE); }
-void action_playlist_remove_dupes_by_title ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_remove_dupes_by_filename ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_remove_dupes_by_full_path ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Path); }
-
-void action_playlist_remove_all ()
-{
-    int playlist = ACTIVE;
-    aud_playlist_entry_delete (playlist, 0, aud_playlist_entry_count (playlist));
-}
-
-void action_playlist_remove_selected ()
-    { aud_playlist_delete_selected (ACTIVE); }
-
-void action_playlist_remove_unselected ()
-{
-    action_playlist_invert_selection ();
-    action_playlist_remove_selected ();
-    action_playlist_select_all ();
-}
-
-void action_playlist_copy ()
-{
-#if 0
-    GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-    Index<char> list = audgui_urilist_create_from_selected (ACTIVE);
-
-    if (list.len ())
-        gtk_clipboard_set_text (clip, list.begin (), list.len ());
-#endif
-}
-
-void action_playlist_cut ()
-{
-    action_playlist_copy ();
-    action_playlist_remove_selected ();
-}
-
-void action_playlist_paste ()
-{
-#if 0
-    GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-    char * list = gtk_clipboard_wait_for_text (clip);
-
-    if (list)
-    {
-        int playlist = ACTIVE;
-        audgui_urilist_insert (playlist, aud_playlist_get_focus (playlist), list);
-        g_free (list);
-    }
-#endif
-}
-
 void action_playlist_add_url ()
     { audqt::urlopener_show (false); }
 void action_playlist_add_files ()
     { audqt::fileopener_show (audqt::FileMode::Add ); }
 void action_playlist_add_folder ()
     { audqt::fileopener_show (audqt::FileMode::AddFolder ); }
-
-void action_playlist_randomize_list ()
-    { aud_playlist_randomize (ACTIVE); }
-void action_playlist_reverse_list ()
-    { aud_playlist_reverse (ACTIVE); }
-
-void action_playlist_sort_by_title ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_sort_by_album ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Album); }
-void action_playlist_sort_by_artist ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Artist); }
-void action_playlist_sort_by_album_artist ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::AlbumArtist); }
-void action_playlist_sort_by_length ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Length); }
-void action_playlist_sort_by_genre ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Genre); }
-void action_playlist_sort_by_filename ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_sort_by_full_path ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Path); }
-void action_playlist_sort_by_date ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Date); }
-void action_playlist_sort_by_track_number ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Track); }
-void action_playlist_sort_by_custom_title ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::FormattedTitle); }
-
-void action_playlist_sort_selected_by_title ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_sort_selected_by_album ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Album); }
-void action_playlist_sort_selected_by_artist ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Artist); }
-void action_playlist_sort_selected_by_album_artist ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::AlbumArtist); }
-void action_playlist_sort_selected_by_length ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Length); }
-void action_playlist_sort_selected_by_genre ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Genre); }
-void action_playlist_sort_selected_by_filename ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_sort_selected_by_full_path ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Path); }
-void action_playlist_sort_selected_by_date ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Date); }
-void action_playlist_sort_selected_by_track_number ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Track); }
-void action_playlist_sort_selected_by_custom_title ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::FormattedTitle); }
-
-void action_playlist_track_info ()
-{
-    int playlist = ACTIVE;
-    audqt::infowin_show (playlist, aud_playlist_get_focus (playlist));
-}
-
-void action_queue_toggle ()
-{
-    int playlist = ACTIVE;
-    int focus = aud_playlist_get_focus (playlist);
-    if (focus == -1)
-        return;
-
-    /* make sure focused row is selected */
-    if (! aud_playlist_entry_get_selected (playlist, focus))
-    {
-        aud_playlist_select_all (playlist, false);
-        aud_playlist_entry_set_selected (playlist, focus, true);
-    }
-
-    int at = aud_playlist_queue_find_entry (playlist, focus);
-    if (at == -1)
-        aud_playlist_queue_insert_selected (playlist, -1);
-    else
-        aud_playlist_queue_delete_selected (playlist);
-}
diff --git a/src/skins-qt/main.cc b/src/skins-qt/main.cc
index 63eb7ee..f1db1a2 100644
--- a/src/skins-qt/main.cc
+++ b/src/skins-qt/main.cc
@@ -208,11 +208,18 @@ void mainwin_show_status_message (const char * message)
 
 static void mainwin_set_song_title (const char * title)
 {
+    StringBuf buf;
+
     if (title)
-        mainwin->setWindowTitle ((const char *) str_printf (_("%s - Audacious"), title));
+        buf.steal (str_printf (_("%s - Audacious"), title));
     else
-        mainwin->setWindowTitle (_("Audacious"));
+        buf.steal (str_copy (_("Audacious")));
+
+    int instance = aud_get_instance ();
+    if (instance != 1)
+        buf.combine (str_printf (" (%d)", instance));
 
+    mainwin->setWindowTitle ((const char *) buf);
     mainwin_set_info_text (title ? title : "");
 }
 
@@ -1056,7 +1063,6 @@ static void mainwin_create_window ()
     bool shaded = aud_get_bool ("skins", "player_shaded");
 
     mainwin = new MainWindow (shaded);
-    mainwin->setWindowTitle (_("Audacious"));
 
 #if 0
     GtkWidget * w = mainwin->gtk ();
@@ -1111,6 +1117,7 @@ void mainwin_create ()
 {
     mainwin_create_window ();
     mainwin_create_widgets ();
+    mainwin_set_song_title (nullptr);
 }
 
 static void mainwin_update_volume ()
diff --git a/src/skins-qt/menus.cc b/src/skins-qt/menus.cc
index f42019b..b302fd8 100644
--- a/src/skins-qt/menus.cc
+++ b/src/skins-qt/menus.cc
@@ -27,6 +27,7 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
 #include <libaudcore/plugins.h>
 #include <libaudcore/runtime.h>
 #include <libaudqt/menu.h>
@@ -36,6 +37,8 @@
 #include "main.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.h"
+
 static QMenu * menus[UI_MENUS];
 
 /* note: playback, playlist, and view menus must be created before main menu */
@@ -52,8 +55,8 @@ static void configure_effects () { audqt::prefswin_show_plugin_page (PluginType:
 static void configure_output () { audqt::prefswin_show_plugin_page (PluginType::Output); }
 static void configure_visualizations () { audqt::prefswin_show_plugin_page (PluginType::Vis); }
 
-static void volume_up () { mainwin_set_volume_diff (5); }
-static void volume_down () { mainwin_set_volume_diff (-5); }
+static void skins_volume_up () { mainwin_set_volume_diff (5); }
+static void skins_volume_down () { mainwin_set_volume_diff (-5); }
 
 /* emulate a config item for the recording toggle */
 static void toggle_record ()
@@ -80,8 +83,8 @@ static void record_toggled (void * = nullptr, void * = nullptr)
 }
 
 static const audqt::MenuItem output_items[] = {
-    audqt::MenuCommand ({N_("Volume Up"), "audio-volume-high", "+"}, volume_up),
-    audqt::MenuCommand ({N_("Volume Down"), "audio-volume-low", "-"}, volume_down),
+    audqt::MenuCommand ({N_("Volume Up"), "audio-volume-high", "+"}, skins_volume_up),
+    audqt::MenuCommand ({N_("Volume Down"), "audio-volume-low", "-"}, skins_volume_down),
     audqt::MenuSep (),
     audqt::MenuCommand ({N_("Effects ...")}, configure_effects),
     audqt::MenuSep (),
@@ -132,14 +135,14 @@ static const audqt::MenuItem playback_items[] = {
 };
 
 static const audqt::MenuItem playlist_items[] = {
-    audqt::MenuCommand ({N_("Play/Resume"), "media-playback-start", "Shift+Return"}, action_playlist_play),
+    audqt::MenuCommand ({N_("Play/Resume"), "media-playback-start", "Shift+Return"}, pl_play),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("New Playlist"), "document-new", "Shift+N"}, action_playlist_new),
+    audqt::MenuCommand ({N_("New Playlist"), "document-new", "Shift+N"}, (audqt::MenuFunc) aud_playlist_new),
     audqt::MenuCommand ({N_("Rename Playlist ..."), "insert-text", "F2"}, action_playlist_rename),
     audqt::MenuCommand ({N_("Remove Playlist"), "edit-delete", "Shift+D"}, action_playlist_delete),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("Previous Playlist"), "media-skip-backward", "Shift+Tab"}, action_playlist_prev),
-    audqt::MenuCommand ({N_("Next Playlist"), "media-skip-forward", "Tab"}, action_playlist_next),
+    audqt::MenuCommand ({N_("Previous Playlist"), "media-skip-backward", "Shift+Tab"}, pl_prev),
+    audqt::MenuCommand ({N_("Next Playlist"), "media-skip-forward", "Tab"}, pl_next),
     audqt::MenuSep (),
 #if 0
     audqt::MenuCommand ({N_("Import Playlist ..."), "document-open", "O"}, audgui_import_playlist),
@@ -149,7 +152,7 @@ static const audqt::MenuItem playlist_items[] = {
     audqt::MenuCommand ({N_("Playlist Manager ..."), "audio-x-generic", "P"}, action_playlist_manager),
     audqt::MenuCommand ({N_("Queue Manager ..."), nullptr, "Ctrl+U"}, audqt::queue_manager_show),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("Refresh Playlist"), "view-refresh", "F5"}, action_playlist_refresh_list)
+    audqt::MenuCommand ({N_("Refresh Playlist"), "view-refresh", "F5"}, pl_refresh)
 };
 
 static const audqt::MenuItem view_items[] = {
@@ -180,76 +183,76 @@ static const audqt::MenuItem playlist_add_items[] = {
 };
 
 static const audqt::MenuItem dupe_items[] = {
-    audqt::MenuCommand ({N_("By Title")}, action_playlist_remove_dupes_by_title),
-    audqt::MenuCommand ({N_("By File Name")}, action_playlist_remove_dupes_by_filename),
-    audqt::MenuCommand ({N_("By File Path")}, action_playlist_remove_dupes_by_full_path)
+    audqt::MenuCommand ({N_("By Title")}, rm_dupes_title),
+    audqt::MenuCommand ({N_("By File Name")}, rm_dupes_filename),
+    audqt::MenuCommand ({N_("By File Path")}, rm_dupes_path)
 };
 
 static const audqt::MenuItem playlist_remove_items[] = {
     audqt::MenuSub ({N_("Services")}, get_plugin_menu_playlist_remove),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("Remove All"), "edit-delete"}, action_playlist_remove_all),
-    audqt::MenuCommand ({N_("Clear Queue"), "edit-clear", "Shift+Q"}, action_playlist_clear_queue),
+    audqt::MenuCommand ({N_("Remove All"), "edit-delete"}, pl_remove_all),
+    audqt::MenuCommand ({N_("Clear Queue"), "edit-clear", "Shift+Q"}, pl_queue_clear),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("Remove Unavailable Files"), "dialog-warning"}, action_playlist_remove_unavailable),
+    audqt::MenuCommand ({N_("Remove Unavailable Files"), "dialog-warning"}, pl_remove_failed),
     audqt::MenuSub ({N_("Remove Duplicates"), "edit-copy"}, {dupe_items}),
     audqt::MenuSep (),
-    audqt::MenuCommand ({N_("Remove Unselected"), "list-remove"}, action_playlist_remove_unselected),
-    audqt::MenuCommand ({N_("Remove Selected"), "list-remove", "Delete"}, action_playlist_remove_selected)
+    audqt::MenuCommand ({N_("Remove Unselected"), "list-remove"}, pl_remove_unselected),
+    audqt::MenuCommand ({N_("Remove Selected"), "list-remove", "Delete"}, pl_remove_selected)
 };
 
 static const audqt::MenuItem playlist_select_items[] = {
-    audqt::MenuCommand ({N_("Invert Selection")}, action_playlist_invert_selection),
-    audqt::MenuCommand ({N_("Select None"), nullptr, "Shift+Ctrl+A"}, action_playlist_select_none),
-    audqt::MenuCommand ({N_("Select All"), "edit-select-all", "Ctrl+A"}, action_playlist_select_all),
+    audqt::MenuCommand ({N_("Invert Selection")}, pl_select_invert),
+    audqt::MenuCommand ({N_("Select None"), nullptr, "Shift+Ctrl+A"}, pl_select_none),
+    audqt::MenuCommand ({N_("Select All"), "edit-select-all", "Ctrl+A"}, pl_select_all),
 };
 
 static const audqt::MenuItem sort_items[] = {
-    audqt::MenuCommand ({N_("By Track Number")}, action_playlist_sort_by_track_number),
-    audqt::MenuCommand ({N_("By Title")}, action_playlist_sort_by_title),
-    audqt::MenuCommand ({N_("By Artist")}, action_playlist_sort_by_artist),
-    audqt::MenuCommand ({N_("By Album")}, action_playlist_sort_by_album),
-    audqt::MenuCommand ({N_("By Album Artist")}, action_playlist_sort_by_album_artist),
-    audqt::MenuCommand ({N_("By Release Date")}, action_playlist_sort_by_date),
-    audqt::MenuCommand ({N_("By Genre")}, action_playlist_sort_by_genre),
-    audqt::MenuCommand ({N_("By Length")}, action_playlist_sort_by_length),
-    audqt::MenuCommand ({N_("By File Name")}, action_playlist_sort_by_filename),
-    audqt::MenuCommand ({N_("By File Path")}, action_playlist_sort_by_full_path),
-    audqt::MenuCommand ({N_("By Custom Title")}, action_playlist_sort_by_custom_title)
+    audqt::MenuCommand ({N_("By Track Number")}, sort_track),
+    audqt::MenuCommand ({N_("By Title")}, sort_title),
+    audqt::MenuCommand ({N_("By Artist")}, sort_artist),
+    audqt::MenuCommand ({N_("By Album")}, sort_album),
+    audqt::MenuCommand ({N_("By Album Artist")}, sort_album_artist),
+    audqt::MenuCommand ({N_("By Release Date")}, sort_date),
+    audqt::MenuCommand ({N_("By Genre")}, sort_genre),
+    audqt::MenuCommand ({N_("By Length")}, sort_length),
+    audqt::MenuCommand ({N_("By File Name")}, sort_filename),
+    audqt::MenuCommand ({N_("By File Path")}, sort_path),
+    audqt::MenuCommand ({N_("By Custom Title")}, sort_custom_title)
 };
 
 static const audqt::MenuItem sort_selected_items[] = {
-    audqt::MenuCommand ({N_("By Track Number")}, action_playlist_sort_selected_by_track_number),
-    audqt::MenuCommand ({N_("By Title")}, action_playlist_sort_selected_by_title),
-    audqt::MenuCommand ({N_("By Artist")}, action_playlist_sort_selected_by_artist),
-    audqt::MenuCommand ({N_("By Album")}, action_playlist_sort_selected_by_album),
-    audqt::MenuCommand ({N_("By Album Artist")}, action_playlist_sort_selected_by_album_artist),
-    audqt::MenuCommand ({N_("By Genre")}, action_playlist_sort_selected_by_genre),
-    audqt::MenuCommand ({N_("By Release Date")}, action_playlist_sort_selected_by_date),
-    audqt::MenuCommand ({N_("By Length")}, action_playlist_sort_selected_by_length),
-    audqt::MenuCommand ({N_("By File Name")}, action_playlist_sort_selected_by_filename),
-    audqt::MenuCommand ({N_("By File Path")}, action_playlist_sort_selected_by_full_path),
-    audqt::MenuCommand ({N_("By Custom Title")}, action_playlist_sort_selected_by_custom_title)
+    audqt::MenuCommand ({N_("By Track Number")}, sort_sel_track),
+    audqt::MenuCommand ({N_("By Title")}, sort_sel_title),
+    audqt::MenuCommand ({N_("By Artist")}, sort_sel_artist),
+    audqt::MenuCommand ({N_("By Album")}, sort_sel_album),
+    audqt::MenuCommand ({N_("By Album Artist")}, sort_sel_album_artist),
+    audqt::MenuCommand ({N_("By Genre")}, sort_sel_genre),
+    audqt::MenuCommand ({N_("By Release Date")}, sort_sel_date),
+    audqt::MenuCommand ({N_("By Length")}, sort_sel_length),
+    audqt::MenuCommand ({N_("By File Name")}, sort_sel_filename),
+    audqt::MenuCommand ({N_("By File Path")}, sort_sel_path),
+    audqt::MenuCommand ({N_("By Custom Title")}, sort_sel_custom_title)
 };
 
 static const audqt::MenuItem playlist_sort_items[] = {
-    audqt::MenuCommand ({N_("Randomize List"), nullptr, "Shift+Ctrl+R"}, action_playlist_randomize_list),
-    audqt::MenuCommand ({N_("Reverse List"), "view-sort-descending"}, action_playlist_reverse_list),
+    audqt::MenuCommand ({N_("Randomize List"), nullptr, "Shift+Ctrl+R"}, sort_random),
+    audqt::MenuCommand ({N_("Reverse List"), "view-sort-descending"}, sort_reverse),
     audqt::MenuSep (),
     audqt::MenuSub ({N_("Sort Selected"), "view-sort-ascending"}, {sort_selected_items}),
     audqt::MenuSub ({N_("Sort List"), "view-sort-ascending"}, {sort_items})
 };
 
 static const audqt::MenuItem playlist_context_items[] = {
-    audqt::MenuCommand ({N_("Song Info ..."), "dialog-information", "Alt+I"}, action_playlist_track_info),
+    audqt::MenuCommand ({N_("Song Info ..."), "dialog-information", "Alt+I"}, pl_song_info),
+    audqt::MenuCommand ({N_("Open Containing Folder"), "folder"}, pl_open_folder),
     audqt::MenuSep (),
-#if 0
-    audqt::MenuCommand ({N_("Cut"), "edit-cut", "Ctrl+X"}, action_playlist_cut),
-    audqt::MenuCommand ({N_("Copy"), "edit-copy", "Ctrl+C"}, action_playlist_copy),
-    audqt::MenuCommand ({N_("Paste"), "edit-paste", "Ctrl+V"}, action_playlist_paste),
+    audqt::MenuCommand ({N_("Cut"), "edit-cut", "Ctrl+X"}, pl_cut),
+    audqt::MenuCommand ({N_("Copy"), "edit-copy", "Ctrl+C"}, pl_copy),
+    audqt::MenuCommand ({N_("Paste"), "edit-paste", "Ctrl+V"}, pl_paste),
+    audqt::MenuCommand ({N_("Paste at End"), "edit-paste", "Shift+Ctrl+V"}, pl_paste_end),
     audqt::MenuSep (),
-#endif
-    audqt::MenuCommand ({N_("Queue/Unqueue"), nullptr, "Q"}, action_queue_toggle),
+    audqt::MenuCommand ({N_("Queue/Unqueue"), nullptr, "Q"}, pl_queue_toggle),
     audqt::MenuSep (),
     audqt::MenuSub ({N_("Services")}, get_plugin_menu_playlist)
 };
diff --git a/src/skins-qt/playlist-widget.cc b/src/skins-qt/playlist-widget.cc
index 07b8e30..af7606e 100644
--- a/src/skins-qt/playlist-widget.cc
+++ b/src/skins-qt/playlist-widget.cc
@@ -187,7 +187,7 @@ void PlaylistWidget::draw (QPainter & cr)
 
     for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::Guess);
+        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::NoWait);
         int len = tuple.get_int (Tuple::Length);
         if (len < 0)
             continue;
@@ -235,7 +235,7 @@ void PlaylistWidget::draw (QPainter & cr)
 
     for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::Guess);
+        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::NoWait);
         String title = tuple.get_str (Tuple::FormattedTitle);
 
         cr.setPen (QColor (skin.colors[(i == active_entry) ?
diff --git a/src/skins-qt/playlist.cc b/src/skins-qt/playlist.cc
index 5cb7bac..3b63b34 100644
--- a/src/skins-qt/playlist.cc
+++ b/src/skins-qt/playlist.cc
@@ -104,7 +104,7 @@ static void update_rollup_text ()
 {
     int playlist = aud_playlist_get_active ();
     int entry = aud_playlist_get_position (playlist);
-    Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::Guess);
+    Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::NoWait);
     char scratch[512];
 
     scratch[0] = 0;
diff --git a/src/skins-qt/plugin.cc b/src/skins-qt/plugin.cc
index 9327345..d943164 100644
--- a/src/skins-qt/plugin.cc
+++ b/src/skins-qt/plugin.cc
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <QApplication>
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
@@ -45,6 +44,9 @@
 #include "window.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.cc"
+#include "../ui-common/menu-ops-qt.cc"
+
 class QtSkins : public audqt::QtIfacePlugin
 {
 public:
@@ -52,7 +54,8 @@ public:
         N_("Winamp Classic Interface"),
         PACKAGE,
         nullptr,
-        & skins_prefs
+        & skins_prefs,
+        PluginQtOnly
     };
 
     constexpr QtSkins () : audqt::QtIfacePlugin (info) {}
diff --git a/src/skins-qt/skinselector.cc b/src/skins-qt/skinselector.cc
index f8de313..b6c97ea 100644
--- a/src/skins-qt/skinselector.cc
+++ b/src/skins-qt/skinselector.cc
@@ -102,11 +102,6 @@ static void scan_skindir_func (const char * path, const char * basename)
          String (_("Unarchived Winamp 2.x skin")), String (path));
 }
 
-static int skinlist_compare_func (const SkinNode & a, const SkinNode & b, void *)
-{
-    return str_compare (a.name, b.name);
-}
-
 void skinlist_update ()
 {
     skinlist.clear ();
@@ -125,5 +120,6 @@ void skinlist_update ()
             dir_foreach (dir, scan_skindir_func);
     }
 
-    skinlist.sort (skinlist_compare_func, nullptr);
+    skinlist.sort ([] (const SkinNode & a, const SkinNode & b)
+        { return str_compare (a.name, b.name); });
 }
diff --git a/src/skins-qt/util.cc b/src/skins-qt/util.cc
index 8c7badc..c5d6cf0 100644
--- a/src/skins-qt/util.cc
+++ b/src/skins-qt/util.cc
@@ -275,7 +275,7 @@ StringBuf archive_decompress (const char * filename)
     StringBuf tmpdir = filename_build ({g_get_tmp_dir (), "audacious.XXXXXX"});
     if (! g_mkdtemp (tmpdir))
     {
-        AUDWARN ("Error creating %s: %s\n", strerror (errno));
+        AUDWARN ("Error creating %s: %s\n", (const char *) tmpdir, strerror (errno));
         return StringBuf ();
     }
 
@@ -352,5 +352,5 @@ bool dir_foreach (const char * path, DirForeachFunc func)
 void make_directory (const char * path)
 {
     if (g_mkdir_with_parents (path, DIRMODE) != 0)
-        AUDWARN ("Error creating %s: %s\n", strerror (errno));
+        AUDWARN ("Error creating %s: %s\n", path, strerror (errno));
 }
diff --git a/src/skins/actions-playlist.h b/src/skins/actions-playlist.h
index 97b04ea..7729241 100644
--- a/src/skins/actions-playlist.h
+++ b/src/skins/actions-playlist.h
@@ -20,63 +20,12 @@
 #ifndef SKINS_ACTIONS_PLAYLIST_H
 #define SKINS_ACTIONS_PLAYLIST_H
 
-void action_playlist_refresh_list ();
-
-void action_playlist_play ();
-void action_playlist_prev ();
-void action_playlist_next ();
 void action_playlist_rename ();
 void action_playlist_delete ();
 
 void action_playlist_search_and_select ();
-void action_playlist_invert_selection ();
-void action_playlist_select_all ();
-void action_playlist_select_none ();
-
-void action_playlist_clear_queue ();
-void action_playlist_remove_unavailable ();
-void action_playlist_remove_dupes_by_title ();
-void action_playlist_remove_dupes_by_filename ();
-void action_playlist_remove_dupes_by_full_path ();
-void action_playlist_remove_all ();
-void action_playlist_remove_selected ();
-void action_playlist_remove_unselected ();
-
-void action_playlist_copy ();
-void action_playlist_cut ();
-void action_playlist_paste ();
 
 void action_playlist_add_url ();
 void action_playlist_add_files ();
 
-void action_playlist_randomize_list ();
-void action_playlist_reverse_list ();
-
-void action_playlist_sort_by_title ();
-void action_playlist_sort_by_album ();
-void action_playlist_sort_by_artist ();
-void action_playlist_sort_by_album_artist ();
-void action_playlist_sort_by_length ();
-void action_playlist_sort_by_genre ();
-void action_playlist_sort_by_filename ();
-void action_playlist_sort_by_full_path ();
-void action_playlist_sort_by_date ();
-void action_playlist_sort_by_track_number ();
-void action_playlist_sort_by_custom_title ();
-
-void action_playlist_sort_selected_by_title ();
-void action_playlist_sort_selected_by_album ();
-void action_playlist_sort_selected_by_artist ();
-void action_playlist_sort_selected_by_album_artist ();
-void action_playlist_sort_selected_by_length ();
-void action_playlist_sort_selected_by_genre ();
-void action_playlist_sort_selected_by_filename ();
-void action_playlist_sort_selected_by_full_path ();
-void action_playlist_sort_selected_by_date ();
-void action_playlist_sort_selected_by_track_number ();
-void action_playlist_sort_selected_by_custom_title ();
-
-void action_playlist_track_info ();
-void action_queue_toggle ();
-
 #endif /* SKINS_ACTIONS_PLAYLIST_H */
diff --git a/src/skins/actions.cc b/src/skins/actions.cc
index 3d42dcb..6b2a60f 100644
--- a/src/skins/actions.cc
+++ b/src/skins/actions.cc
@@ -28,6 +28,8 @@
 #include "main.h"
 #include "plugin-window.h"
 
+#include "../ui-common/menu-ops.h"
+
 #include <gtk/gtk.h>
 
 #include <libaudcore/drct.h>
@@ -92,191 +94,12 @@ void action_search_tool ()
     }
 }
 
-void action_playlist_refresh_list ()
-    { aud_playlist_rescan (ACTIVE); }
-void action_playlist_play ()
-    { aud_playlist_play (ACTIVE); }
-
-void action_playlist_prev ()
-{
-    int playlist = ACTIVE;
-    if (playlist > 0)
-        aud_playlist_set_active (playlist - 1);
-    else
-    {
-        int count = aud_playlist_count ();
-        if (count > 1)
-            aud_playlist_set_active (count - 1);
-    }
-}
-
-void action_playlist_next ()
-{
-    int playlist = ACTIVE;
-    int count = aud_playlist_count ();
-    if (playlist + 1 < count)
-        aud_playlist_set_active (playlist + 1);
-    else if (count > 1)
-        aud_playlist_set_active (0);
-}
-
 void action_playlist_rename ()
     { audgui_show_playlist_rename (ACTIVE); }
 void action_playlist_delete ()
     { audgui_confirm_playlist_delete (ACTIVE); }
 
-void action_playlist_invert_selection ()
-{
-    int playlist = ACTIVE;
-    int entries = aud_playlist_entry_count (playlist);
-    for (int entry = 0; entry < entries; entry ++)
-        aud_playlist_entry_set_selected (playlist, entry,
-         ! aud_playlist_entry_get_selected (playlist, entry));
-}
-
-void action_playlist_select_all ()
-    { aud_playlist_select_all (ACTIVE, true); }
-void action_playlist_select_none ()
-    { aud_playlist_select_all (ACTIVE, false); }
-
-void action_playlist_clear_queue ()
-{
-    int playlist = ACTIVE;
-    aud_playlist_queue_delete (playlist, 0, aud_playlist_queue_count (playlist));
-}
-
-void action_playlist_remove_unavailable ()
-    { aud_playlist_remove_failed (ACTIVE); }
-void action_playlist_remove_dupes_by_title ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_remove_dupes_by_filename ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_remove_dupes_by_full_path ()
-    { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Path); }
-
-void action_playlist_remove_all ()
-{
-    int playlist = ACTIVE;
-    aud_playlist_entry_delete (playlist, 0, aud_playlist_entry_count (playlist));
-}
-
-void action_playlist_remove_selected ()
-    { aud_playlist_delete_selected (ACTIVE); }
-
-void action_playlist_remove_unselected ()
-{
-    action_playlist_invert_selection ();
-    action_playlist_remove_selected ();
-    action_playlist_select_all ();
-}
-
-void action_playlist_copy ()
-{
-    GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-    Index<char> list = audgui_urilist_create_from_selected (ACTIVE);
-
-    if (list.len ())
-        gtk_clipboard_set_text (clip, list.begin (), list.len ());
-}
-
-void action_playlist_cut ()
-{
-    action_playlist_copy ();
-    action_playlist_remove_selected ();
-}
-
-void action_playlist_paste ()
-{
-    GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-    char * list = gtk_clipboard_wait_for_text (clip);
-
-    if (list)
-    {
-        int playlist = ACTIVE;
-        audgui_urilist_insert (playlist, aud_playlist_get_focus (playlist), list);
-        g_free (list);
-    }
-}
-
 void action_playlist_add_url ()
     { audgui_show_add_url_window (false); }
 void action_playlist_add_files ()
     { audgui_run_filebrowser (false); }
-
-void action_playlist_randomize_list ()
-    { aud_playlist_randomize (ACTIVE); }
-void action_playlist_reverse_list ()
-    { aud_playlist_reverse (ACTIVE); }
-
-void action_playlist_sort_by_title ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_sort_by_album ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Album); }
-void action_playlist_sort_by_artist ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Artist); }
-void action_playlist_sort_by_album_artist ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::AlbumArtist); }
-void action_playlist_sort_by_length ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Length); }
-void action_playlist_sort_by_genre ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Genre); }
-void action_playlist_sort_by_filename ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_sort_by_full_path ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Path); }
-void action_playlist_sort_by_date ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Date); }
-void action_playlist_sort_by_track_number ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Track); }
-void action_playlist_sort_by_custom_title ()
-    { aud_playlist_sort_by_scheme (ACTIVE, Playlist::FormattedTitle); }
-
-void action_playlist_sort_selected_by_title ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Title); }
-void action_playlist_sort_selected_by_album ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Album); }
-void action_playlist_sort_selected_by_artist ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Artist); }
-void action_playlist_sort_selected_by_album_artist ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::AlbumArtist); }
-void action_playlist_sort_selected_by_length ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Length); }
-void action_playlist_sort_selected_by_genre ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Genre); }
-void action_playlist_sort_selected_by_filename ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Filename); }
-void action_playlist_sort_selected_by_full_path ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Path); }
-void action_playlist_sort_selected_by_date ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Date); }
-void action_playlist_sort_selected_by_track_number ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Track); }
-void action_playlist_sort_selected_by_custom_title ()
-    { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::FormattedTitle); }
-
-void action_playlist_track_info ()
-{
-    int playlist = ACTIVE;
-    audgui_infowin_show (playlist, aud_playlist_get_focus (playlist));
-}
-
-void action_queue_toggle ()
-{
-    int playlist = ACTIVE;
-    int focus = aud_playlist_get_focus (playlist);
-    if (focus == -1)
-        return;
-
-    /* make sure focused row is selected */
-    if (! aud_playlist_entry_get_selected (playlist, focus))
-    {
-        aud_playlist_select_all (playlist, false);
-        aud_playlist_entry_set_selected (playlist, focus, true);
-    }
-
-    int at = aud_playlist_queue_find_entry (playlist, focus);
-    if (at == -1)
-        aud_playlist_queue_insert_selected (playlist, -1);
-    else
-        aud_playlist_queue_delete_selected (playlist);
-}
diff --git a/src/skins/main.cc b/src/skins/main.cc
index b8fc696..704992a 100644
--- a/src/skins/main.cc
+++ b/src/skins/main.cc
@@ -63,6 +63,8 @@
 #include "util.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.h"
+
 #define SEEK_THRESHOLD 200 /* milliseconds */
 #define SEEK_SPEED 50 /* milliseconds per pixel */
 
@@ -211,11 +213,18 @@ void mainwin_show_status_message (const char * message)
 
 static void mainwin_set_song_title (const char * title)
 {
+    StringBuf buf;
+
     if (title)
-        mainwin->setWindowTitle ((const char *) str_printf (_("%s - Audacious"), title));
+        buf.steal (str_printf (_("%s - Audacious"), title));
     else
-        mainwin->setWindowTitle (_("Audacious"));
+        buf.steal (str_copy (_("Audacious")));
 
+    int instance = aud_get_instance ();
+    if (instance != 1)
+        buf.combine (str_printf (" (%d)", instance));
+
+    mainwin->setWindowTitle ((const char *) buf);
     mainwin_set_info_text (title ? title : "");
 }
 
@@ -531,13 +540,13 @@ bool Window::keypress (GdkEventKey * event)
             break;
         case GDK_KEY_Tab: /* GtkUIManager does not handle tab, apparently. */
             if (event->state & GDK_SHIFT_MASK)
-                action_playlist_prev ();
+                pl_prev ();
             else
-                action_playlist_next ();
+                pl_next ();
 
             break;
         case GDK_KEY_ISO_Left_Tab:
-            action_playlist_prev ();
+            pl_prev ();
             break;
         default:
             return false;
@@ -1100,7 +1109,6 @@ static void mainwin_create_window ()
     bool shaded = aud_get_bool ("skins", "player_shaded");
 
     mainwin = new MainWindow (shaded);
-    mainwin->setWindowTitle (_("Audacious"));
 
     GtkWidget * w = mainwin->gtk ();
     drag_dest_set (w);
@@ -1153,6 +1161,7 @@ void mainwin_create ()
 {
     mainwin_create_window ();
     mainwin_create_widgets ();
+    mainwin_set_song_title (nullptr);
 }
 
 static void mainwin_update_volume ()
diff --git a/src/skins/menus.cc b/src/skins/menus.cc
index 8c3a435..e50e0d3 100644
--- a/src/skins/menus.cc
+++ b/src/skins/menus.cc
@@ -39,6 +39,8 @@
 #include "main.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.h"
+
 #define SHIFT GDK_SHIFT_MASK
 #define CTRL GDK_CONTROL_MASK
 #define ALT GDK_MOD1_MASK
@@ -66,8 +68,8 @@ static void configure_effects () { audgui_show_prefs_for_plugin_type (PluginType
 static void configure_output () { audgui_show_prefs_for_plugin_type (PluginType::Output); }
 static void configure_visualizations () { audgui_show_prefs_for_plugin_type (PluginType::Vis); }
 
-static void volume_up () { mainwin_set_volume_diff (5); }
-static void volume_down () { mainwin_set_volume_diff (-5); }
+static void skins_volume_up () { mainwin_set_volume_diff (5); }
+static void skins_volume_down () { mainwin_set_volume_diff (-5); }
 
 /* emulate a config item for the recording toggle */
 static void toggle_record ()
@@ -94,8 +96,8 @@ static void record_toggled (void * = nullptr, void * = nullptr)
 }
 
 static const AudguiMenuItem output_items[] = {
-    MenuCommand (N_("Volume Up"), "audio-volume-high", '+', NO_MOD, volume_up),
-    MenuCommand (N_("Volume Down"), "audio-volume-low", '-', NO_MOD, volume_down),
+    MenuCommand (N_("Volume Up"), "audio-volume-high", '+', NO_MOD, skins_volume_up),
+    MenuCommand (N_("Volume Down"), "audio-volume-low", '-', NO_MOD, skins_volume_down),
     MenuSep (),
     MenuCommand (N_("Effects ..."), nullptr, NO_KEY, configure_effects),
     MenuSep (),
@@ -143,14 +145,14 @@ static const AudguiMenuItem playback_items[] = {
 };
 
 static const AudguiMenuItem playlist_items[] = {
-    MenuCommand (N_("Play/Resume"), "media-playback-start", GDK_KEY_Return, SHIFT, action_playlist_play),
+    MenuCommand (N_("Play/Resume"), "media-playback-start", GDK_KEY_Return, SHIFT, pl_play),
     MenuSep (),
     MenuCommand (N_("New Playlist"), "document-new", 'n', SHIFT, (GCallback) aud_playlist_new),
     MenuCommand (N_("Rename Playlist ..."), "insert-text", GDK_KEY_F2, NO_MOD, action_playlist_rename),
     MenuCommand (N_("Remove Playlist"), "edit-delete", 'd', SHIFT, action_playlist_delete),
     MenuSep (),
-    MenuCommand (N_("Previous Playlist"), "media-skip-backward", GDK_KEY_Tab, SHIFT, action_playlist_prev),
-    MenuCommand (N_("Next Playlist"), "media-skip-forward", GDK_KEY_Tab, NO_MOD, action_playlist_next),
+    MenuCommand (N_("Previous Playlist"), "media-skip-backward", GDK_KEY_Tab, SHIFT, pl_prev),
+    MenuCommand (N_("Next Playlist"), "media-skip-forward", GDK_KEY_Tab, NO_MOD, pl_next),
     MenuSep (),
     MenuCommand (N_("Import Playlist ..."), "document-open", 'o', NO_MOD, audgui_import_playlist),
     MenuCommand (N_("Export Playlist ..."), "document-save", 's', SHIFT, audgui_export_playlist),
@@ -158,7 +160,7 @@ static const AudguiMenuItem playlist_items[] = {
     MenuCommand (N_("Playlist Manager ..."), "audio-x-generic", 'p', NO_MOD, action_playlist_manager),
     MenuCommand (N_("Queue Manager ..."), nullptr, 'u', CTRL, audgui_queue_manager_show),
     MenuSep (),
-    MenuCommand (N_("Refresh Playlist"), "view-refresh", GDK_KEY_F5, NO_MOD, action_playlist_refresh_list)
+    MenuCommand (N_("Refresh Playlist"), "view-refresh", GDK_KEY_F5, NO_MOD, pl_refresh)
 };
 
 static const AudguiMenuItem view_items[] = {
@@ -186,76 +188,78 @@ static const AudguiMenuItem playlist_add_items[] = {
 };
 
 static const AudguiMenuItem dupe_items[] = {
-    MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_remove_dupes_by_title),
-    MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_remove_dupes_by_filename),
-    MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_remove_dupes_by_full_path)
+    MenuCommand (N_("By Title"), nullptr, NO_KEY, rm_dupes_title),
+    MenuCommand (N_("By File Name"), nullptr, NO_KEY, rm_dupes_filename),
+    MenuCommand (N_("By File Path"), nullptr, NO_KEY, rm_dupes_path)
 };
 
 static const AudguiMenuItem playlist_remove_items[] = {
     MenuSub (N_("Services"), nullptr, get_plugin_menu_playlist_remove),
     MenuSep (),
-    MenuCommand (N_("Remove All"), "edit-delete", NO_KEY, action_playlist_remove_all),
-    MenuCommand (N_("Clear Queue"), "edit-clear", 'q', SHIFT, action_playlist_clear_queue),
+    MenuCommand (N_("Remove All"), "edit-delete", NO_KEY, pl_remove_all),
+    MenuCommand (N_("Clear Queue"), "edit-clear", 'q', SHIFT, pl_queue_clear),
     MenuSep (),
-    MenuCommand (N_("Remove Unavailable Files"), "dialog-warning", NO_KEY, action_playlist_remove_unavailable),
+    MenuCommand (N_("Remove Unavailable Files"), "dialog-warning", NO_KEY, pl_remove_failed),
     MenuSub (N_("Remove Duplicates"), "edit-copy", {dupe_items}),
     MenuSep (),
-    MenuCommand (N_("Remove Unselected"), "list-remove", NO_KEY, action_playlist_remove_unselected),
-    MenuCommand (N_("Remove Selected"), "list-remove", GDK_KEY_Delete, NO_MOD, action_playlist_remove_selected)
+    MenuCommand (N_("Remove Unselected"), "list-remove", NO_KEY, pl_remove_unselected),
+    MenuCommand (N_("Remove Selected"), "list-remove", GDK_KEY_Delete, NO_MOD, pl_remove_selected)
 };
 
 static const AudguiMenuItem playlist_select_items[] = {
     MenuCommand (N_("Search and Select"), "edit-find", 'f', CTRL, action_playlist_search_and_select),
     MenuSep (),
-    MenuCommand (N_("Invert Selection"), nullptr, NO_KEY, action_playlist_invert_selection),
-    MenuCommand (N_("Select None"), nullptr, 'a', SHIFT_CTRL, action_playlist_select_none),
-    MenuCommand (N_("Select All"), "edit-select-all", 'a', CTRL, action_playlist_select_all),
+    MenuCommand (N_("Invert Selection"), nullptr, NO_KEY, pl_select_invert),
+    MenuCommand (N_("Select None"), nullptr, 'a', SHIFT_CTRL, pl_select_none),
+    MenuCommand (N_("Select All"), "edit-select-all", 'a', CTRL, pl_select_all),
 };
 
 static const AudguiMenuItem sort_items[] = {
-    MenuCommand (N_("By Track Number"), nullptr, NO_KEY, action_playlist_sort_by_track_number),
-    MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_sort_by_title),
-    MenuCommand (N_("By Artist"), nullptr, NO_KEY, action_playlist_sort_by_artist),
-    MenuCommand (N_("By Album"), nullptr, NO_KEY, action_playlist_sort_by_album),
-    MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, action_playlist_sort_by_album_artist),
-    MenuCommand (N_("By Release Date"), nullptr, NO_KEY, action_playlist_sort_by_date),
-    MenuCommand (N_("By Genre"), nullptr, NO_KEY, action_playlist_sort_by_genre),
-    MenuCommand (N_("By Length"), nullptr, NO_KEY, action_playlist_sort_by_length),
-    MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_sort_by_filename),
-    MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_sort_by_full_path),
-    MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, action_playlist_sort_by_custom_title)
+    MenuCommand (N_("By Track Number"), nullptr, NO_KEY, sort_track),
+    MenuCommand (N_("By Title"), nullptr, NO_KEY, sort_title),
+    MenuCommand (N_("By Artist"), nullptr, NO_KEY, sort_artist),
+    MenuCommand (N_("By Album"), nullptr, NO_KEY, sort_album),
+    MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, sort_album_artist),
+    MenuCommand (N_("By Release Date"), nullptr, NO_KEY, sort_date),
+    MenuCommand (N_("By Genre"), nullptr, NO_KEY, sort_genre),
+    MenuCommand (N_("By Length"), nullptr, NO_KEY, sort_length),
+    MenuCommand (N_("By File Name"), nullptr, NO_KEY, sort_filename),
+    MenuCommand (N_("By File Path"), nullptr, NO_KEY, sort_path),
+    MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_custom_title)
 };
 
 static const AudguiMenuItem sort_selected_items[] = {
-    MenuCommand (N_("By Track Number"), nullptr, NO_KEY, action_playlist_sort_selected_by_track_number),
-    MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_sort_selected_by_title),
-    MenuCommand (N_("By Artist"), nullptr, NO_KEY, action_playlist_sort_selected_by_artist),
-    MenuCommand (N_("By Album"), nullptr, NO_KEY, action_playlist_sort_selected_by_album),
-    MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, action_playlist_sort_selected_by_album_artist),
-    MenuCommand (N_("By Genre"), nullptr, NO_KEY, action_playlist_sort_selected_by_genre),
-    MenuCommand (N_("By Release Date"), nullptr, NO_KEY, action_playlist_sort_selected_by_date),
-    MenuCommand (N_("By Length"), nullptr, NO_KEY, action_playlist_sort_selected_by_length),
-    MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_sort_selected_by_filename),
-    MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_sort_selected_by_full_path),
-    MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, action_playlist_sort_selected_by_custom_title)
+    MenuCommand (N_("By Track Number"), nullptr, NO_KEY, sort_sel_track),
+    MenuCommand (N_("By Title"), nullptr, NO_KEY, sort_sel_title),
+    MenuCommand (N_("By Artist"), nullptr, NO_KEY, sort_sel_artist),
+    MenuCommand (N_("By Album"), nullptr, NO_KEY, sort_sel_album),
+    MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, sort_sel_album_artist),
+    MenuCommand (N_("By Genre"), nullptr, NO_KEY, sort_sel_genre),
+    MenuCommand (N_("By Release Date"), nullptr, NO_KEY, sort_sel_date),
+    MenuCommand (N_("By Length"), nullptr, NO_KEY, sort_sel_length),
+    MenuCommand (N_("By File Name"), nullptr, NO_KEY, sort_sel_filename),
+    MenuCommand (N_("By File Path"), nullptr, NO_KEY, sort_sel_path),
+    MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_sel_custom_title)
 };
 
 static const AudguiMenuItem playlist_sort_items[] = {
-    MenuCommand (N_("Randomize List"), nullptr, 'r', SHIFT_CTRL, action_playlist_randomize_list),
-    MenuCommand (N_("Reverse List"), "view-sort-descending", NO_KEY, action_playlist_reverse_list),
+    MenuCommand (N_("Randomize List"), nullptr, 'r', SHIFT_CTRL, sort_random),
+    MenuCommand (N_("Reverse List"), "view-sort-descending", NO_KEY, sort_reverse),
     MenuSep (),
     MenuSub (N_("Sort Selected"), "view-sort-ascending", {sort_selected_items}),
     MenuSub (N_("Sort List"), "view-sort-ascending", {sort_items})
 };
 
 static const AudguiMenuItem playlist_context_items[] = {
-    MenuCommand (N_("Song Info ..."), "dialog-information", 'i', ALT, action_playlist_track_info),
+    MenuCommand (N_("Song Info ..."), "dialog-information", 'i', ALT, pl_song_info),
+    MenuCommand (N_("Open Containing Folder"), "folder", NO_KEY, pl_open_folder),
     MenuSep (),
-    MenuCommand (N_("Cut"), "edit-cut", 'x', CTRL, action_playlist_cut),
-    MenuCommand (N_("Copy"), "edit-copy", 'c', CTRL, action_playlist_copy),
-    MenuCommand (N_("Paste"), "edit-paste", 'v', CTRL, action_playlist_paste),
+    MenuCommand (N_("Cut"), "edit-cut", 'x', CTRL, pl_cut),
+    MenuCommand (N_("Copy"), "edit-copy", 'c', CTRL, pl_copy),
+    MenuCommand (N_("Paste"), "edit-paste", 'v', CTRL, pl_paste),
+    MenuCommand (N_("Paste at End"), "edit-paste", 'v', SHIFT_CTRL, pl_paste_end),
     MenuSep (),
-    MenuCommand (N_("Queue/Unqueue"), nullptr, 'q', NO_MOD, action_queue_toggle),
+    MenuCommand (N_("Queue/Unqueue"), nullptr, 'q', NO_MOD, pl_queue_toggle),
     MenuSep (),
     MenuSub (N_("Services"), nullptr, get_plugin_menu_playlist)
 };
diff --git a/src/skins/playlist-widget.cc b/src/skins/playlist-widget.cc
index d493eb6..96edb82 100644
--- a/src/skins/playlist-widget.cc
+++ b/src/skins/playlist-widget.cc
@@ -204,7 +204,7 @@ void PlaylistWidget::draw (cairo_t * cr)
 
     for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::Guess);
+        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::NoWait);
         int len = tuple.get_int (Tuple::Length);
         if (len < 0)
             continue;
@@ -262,7 +262,7 @@ void PlaylistWidget::draw (cairo_t * cr)
 
     for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
     {
-        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::Guess);
+        Tuple tuple = aud_playlist_entry_get_tuple (m_playlist, i, Playlist::NoWait);
         String title = tuple.get_str (Tuple::FormattedTitle);
 
         layout = gtk_widget_create_pango_layout (gtk_dr (), title);
diff --git a/src/skins/playlist.cc b/src/skins/playlist.cc
index 0ab4a42..af95724 100644
--- a/src/skins/playlist.cc
+++ b/src/skins/playlist.cc
@@ -108,7 +108,7 @@ static void update_rollup_text ()
 {
     int playlist = aud_playlist_get_active ();
     int entry = aud_playlist_get_position (playlist);
-    Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::Guess);
+    Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::NoWait);
     char scratch[512];
 
     scratch[0] = 0;
diff --git a/src/skins/plugin-window.cc b/src/skins/plugin-window.cc
index d438abf..485fcb9 100644
--- a/src/skins/plugin-window.cc
+++ b/src/skins/plugin-window.cc
@@ -78,6 +78,9 @@ static void add_dock_plugin (PluginHandle * plugin, void * unused)
 
         if (pos_str && str_to_int_array (pos_str, pos, aud::n_elems (pos)))
         {
+            pos[2] = audgui_to_native_dpi (pos[2]);
+            pos[3] = audgui_to_native_dpi (pos[3]);
+
             gtk_window_set_default_size ((GtkWindow *) window, pos[2], pos[3]);
             gtk_window_move ((GtkWindow *) window, pos[0], pos[1]);
         }
@@ -103,6 +106,9 @@ static void save_window_size (GtkWidget * window)
     gtk_window_get_position ((GtkWindow *) window, & pos[0], & pos[1]);
     gtk_window_get_size ((GtkWindow *) window, & pos[2], & pos[3]);
 
+    pos[2] = audgui_to_portable_dpi (pos[2]);
+    pos[3] = audgui_to_portable_dpi (pos[3]);
+
     const char * basename = aud_plugin_get_basename (plugin);
     StringBuf pos_str = int_array_to_str (pos, aud::n_elems (pos));
     aud_set_str ("skins-layout", basename, pos_str);
diff --git a/src/skins/plugin.cc b/src/skins/plugin.cc
index a027615..bab7ed6 100644
--- a/src/skins/plugin.cc
+++ b/src/skins/plugin.cc
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
@@ -43,6 +42,9 @@
 #include "window.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.cc"
+#include "../ui-common/menu-ops-gtk.cc"
+
 class SkinnedUI : public IfacePlugin
 {
 public:
@@ -50,7 +52,8 @@ public:
         N_("Winamp Classic Interface"),
         PACKAGE,
         nullptr,
-        & skins_prefs
+        & skins_prefs,
+        PluginGLibOnly
     };
 
     constexpr SkinnedUI () : IfacePlugin (info) {}
@@ -86,6 +89,9 @@ public:
         { audgui_plugin_menu_add (id, func, name, icon); }
     void plugin_menu_remove (AudMenuID id, void func ())
         { audgui_plugin_menu_remove (id, func); }
+
+    void startup_notify (const char * id)
+        { gdk_notify_startup_complete_with_id (id); }
 };
 
 EXPORT SkinnedUI aud_plugin_instance;
diff --git a/src/skins/search-select.cc b/src/skins/search-select.cc
index 47741c1..2267473 100644
--- a/src/skins/search-select.cc
+++ b/src/skins/search-select.cc
@@ -60,7 +60,7 @@ static void copy_selected_to_new (int playlist)
         {
             items.append
              (aud_playlist_entry_get_filename (playlist, entry),
-              aud_playlist_entry_get_tuple (playlist, entry, Playlist::Nothing));
+              aud_playlist_entry_get_tuple (playlist, entry, Playlist::NoWait));
         }
     }
 
diff --git a/src/skins/skinselector.cc b/src/skins/skinselector.cc
index fe8044c..7d090c3 100644
--- a/src/skins/skinselector.cc
+++ b/src/skins/skinselector.cc
@@ -115,11 +115,6 @@ static void scan_skindir_func (const char * path, const char * basename)
          String (_("Unarchived Winamp 2.x skin")), String (path));
 }
 
-static int skinlist_compare_func (const SkinNode & a, const SkinNode & b, void *)
-{
-    return str_compare (a.name, b.name);
-}
-
 static void skinlist_update ()
 {
     skinlist.clear ();
@@ -138,7 +133,8 @@ static void skinlist_update ()
             dir_foreach (dir, scan_skindir_func);
     }
 
-    skinlist.sort (skinlist_compare_func, nullptr);
+    skinlist.sort ([] (const SkinNode & a, const SkinNode & b)
+        { return str_compare (a.name, b.name); });
 }
 
 void skin_view_update (GtkTreeView * treeview)
diff --git a/src/skins/util.cc b/src/skins/util.cc
index 8c7badc..793765c 100644
--- a/src/skins/util.cc
+++ b/src/skins/util.cc
@@ -80,14 +80,7 @@ StringBuf find_file_case_path (const char * folder, const char * basename)
 VFSFile open_local_file_nocase (const char * folder, const char * basename)
 {
     StringBuf path = find_file_case_path (folder, basename);
-    if (! path)
-        return VFSFile ();
-
-    StringBuf uri = filename_to_uri (path);
-    if (! uri)
-        return VFSFile ();
-
-    return VFSFile (uri, "r");
+    return path ? VFSFile (filename_to_uri (path), "r") : VFSFile ();
 }
 
 StringBuf skin_pixmap_locate (const char * folder, const char * basename, const char * altname)
@@ -275,7 +268,7 @@ StringBuf archive_decompress (const char * filename)
     StringBuf tmpdir = filename_build ({g_get_tmp_dir (), "audacious.XXXXXX"});
     if (! g_mkdtemp (tmpdir))
     {
-        AUDWARN ("Error creating %s: %s\n", strerror (errno));
+        AUDWARN ("Error creating %s: %s\n", (const char *) tmpdir, strerror (errno));
         return StringBuf ();
     }
 
@@ -352,5 +345,5 @@ bool dir_foreach (const char * path, DirForeachFunc func)
 void make_directory (const char * path)
 {
     if (g_mkdir_with_parents (path, DIRMODE) != 0)
-        AUDWARN ("Error creating %s: %s\n", strerror (errno));
+        AUDWARN ("Error creating %s: %s\n", path, strerror (errno));
 }
diff --git a/src/sndfile/plugin.cc b/src/sndfile/plugin.cc
index 588f024..51e9017 100644
--- a/src/sndfile/plugin.cc
+++ b/src/sndfile/plugin.cc
@@ -41,14 +41,12 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo ()
+    constexpr SndfilePlugin () : InputPlugin (info, InputInfo ()
         .with_priority (9)  /* low priority fallback (but before ffaudio) */
-        .with_exts (exts);
-
-    constexpr SndfilePlugin () : InputPlugin (info, iinfo) {}
+        .with_exts (exts)) {}
 
     bool is_our_file (const char * filename, VFSFile & file);
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool play (const char * filename, VFSFile & file);
 };
 
@@ -128,33 +126,31 @@ static void copy_int (SNDFILE * sf, int sf_id, Tuple & tup, Tuple::Field field)
         tup.set_int (field, atoi (str));
 }
 
-Tuple SndfilePlugin::read_tuple (const char * filename, VFSFile & file)
+bool SndfilePlugin::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
     SF_INFO sfinfo {}; // must be zeroed before sf_open()
     const char *format, *subformat;
-    Tuple ti;
 
     bool stream = (file.fsize () < 0);
     SNDFILE * sndfile = sf_open_virtual (stream ? & sf_virtual_io_stream :
      & sf_virtual_io, SFM_READ, & sfinfo, & file);
 
-    if (sndfile == nullptr)
-        return ti;
-
-    ti.set_filename (filename);
+    if (! sndfile)
+        return false;
 
-    copy_string (sndfile, SF_STR_TITLE, ti, Tuple::Title);
-    copy_string (sndfile, SF_STR_ARTIST, ti, Tuple::Artist);
-    copy_string (sndfile, SF_STR_ALBUM, ti, Tuple::Album);
-    copy_string (sndfile, SF_STR_COMMENT, ti, Tuple::Comment);
-    copy_string (sndfile, SF_STR_GENRE, ti, Tuple::Genre);
-    copy_int (sndfile, SF_STR_DATE, ti, Tuple::Year);
-    copy_int (sndfile, SF_STR_TRACKNUMBER, ti, Tuple::Track);
+    copy_string (sndfile, SF_STR_TITLE, tuple, Tuple::Title);
+    copy_string (sndfile, SF_STR_ARTIST, tuple, Tuple::Artist);
+    copy_string (sndfile, SF_STR_ALBUM, tuple, Tuple::Album);
+    copy_string (sndfile, SF_STR_COMMENT, tuple, Tuple::Comment);
+    copy_string (sndfile, SF_STR_GENRE, tuple, Tuple::Genre);
+    copy_int (sndfile, SF_STR_DATE, tuple, Tuple::Year);
+    copy_int (sndfile, SF_STR_TRACKNUMBER, tuple, Tuple::Track);
 
     sf_close (sndfile);
 
     if (sfinfo.samplerate > 0)
-        ti.set_int (Tuple::Length, ceil (1000.0 * sfinfo.frames / sfinfo.samplerate));
+        tuple.set_int (Tuple::Length, ceil (1000.0 * sfinfo.frames / sfinfo.samplerate));
 
     switch (sfinfo.format & SF_FORMAT_TYPEMASK)
     {
@@ -296,12 +292,12 @@ Tuple SndfilePlugin::read_tuple (const char * filename, VFSFile & file)
     }
 
     if (subformat != nullptr)
-        ti.set_format (str_printf ("%s (%s)", format, subformat),
+        tuple.set_format (str_printf ("%s (%s)", format, subformat),
          sfinfo.channels, sfinfo.samplerate, 0);
     else
-        ti.set_format (format, sfinfo.channels, sfinfo.samplerate, 0);
+        tuple.set_format (format, sfinfo.channels, sfinfo.samplerate, 0);
 
-    return ti;
+    return true;
 }
 
 bool SndfilePlugin::play (const char * filename, VFSFile & file)
diff --git a/src/sndio-ng/Makefile b/src/sndio/Makefile
index bc7bcd8..f1caae5 100644
--- a/src/sndio-ng/Makefile
+++ b/src/sndio/Makefile
@@ -10,4 +10,4 @@ plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 LD = ${CXX}
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../..
-LIBS += ${SNDIO_LIBS}
+LIBS += -lsndio
diff --git a/src/sndio-ng/sndio.cc b/src/sndio/sndio.cc
index 59301f5..b7b986c 100644
--- a/src/sndio-ng/sndio.cc
+++ b/src/sndio/sndio.cc
@@ -19,7 +19,6 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
@@ -54,7 +53,7 @@ public:
     StereoVolume get_volume ();
     void set_volume (StereoVolume v);
 
-    bool open_audio (int format, int rate, int channels);
+    bool open_audio (int format, int rate, int channels, String & error);
     void close_audio ();
 
     void period_wait ();
@@ -167,7 +166,7 @@ static const FormatData format_table[] = {
     {FMT_U32_BE, 32, 4, false, false},
 };
 
-bool SndioPlugin::open_audio (int format, int rate, int channels)
+bool SndioPlugin::open_audio (int format, int rate, int channels, String & error)
 {
     const FormatData * fdata = nullptr;
 
@@ -179,7 +178,7 @@ bool SndioPlugin::open_audio (int format, int rate, int channels)
 
     if (! fdata)
     {
-        aud_ui_show_error (str_printf (_("Sndio error: Unsupported audio format (%d)"), format));
+        error = String (str_printf (_("Sndio error: Unsupported audio format (%d)"), format));
         return false;
     }
 
@@ -190,7 +189,7 @@ bool SndioPlugin::open_audio (int format, int rate, int channels)
 
     if (! m_handle)
     {
-        aud_ui_show_error (_("Sndio error: sio_open() failed"));
+        error = String (_("Sndio error: sio_open() failed"));
         return false;
     }
 
@@ -219,7 +218,7 @@ bool SndioPlugin::open_audio (int format, int rate, int channels)
 
     if (! sio_setpar (m_handle, & par))
     {
-        aud_ui_show_error (_("Sndio error: sio_setpar() failed"));
+        error = String (_("Sndio error: sio_setpar() failed"));
         goto fail;
     }
 
@@ -231,7 +230,7 @@ bool SndioPlugin::open_audio (int format, int rate, int channels)
 
     if (! sio_start (m_handle))
     {
-        aud_ui_show_error (_("Sndio error: sio_start() failed"));
+        error = String (_("Sndio error: sio_start() failed"));
         goto fail;
     }
 
diff --git a/src/song-info-qt/song-info.cc b/src/song-info-qt/song-info.cc
index 6f80108..8d012d6 100644
--- a/src/song-info-qt/song-info.cc
+++ b/src/song-info-qt/song-info.cc
@@ -17,7 +17,6 @@
  * the use of this software.
  */
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
@@ -32,7 +31,10 @@ class SongInfo : public GeneralPlugin {
 public:
     static constexpr PluginInfo info = {
         N_("Song Info"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginQtOnly
     };
 
     constexpr SongInfo () : GeneralPlugin (info, false) {}
@@ -70,7 +72,7 @@ void SongInfo::update (void * unused, audqt::InfoWidget * widget)
         return;
 
     Tuple tuple = aud_playlist_entry_get_tuple (playlist, position);
-    if (tuple)
+    if (tuple.valid ())
         widget->fillInfo (playlist, position, filename, tuple, decoder,
                 aud_file_can_write_tuple (filename, decoder));
 }
diff --git a/src/song_change/Makefile b/src/songchange/Makefile
index 5ae5784..5ae5784 100644
--- a/src/song_change/Makefile
+++ b/src/songchange/Makefile
diff --git a/src/song_change/formatter.cc b/src/songchange/formatter.cc
index 3686cf0..3686cf0 100644
--- a/src/song_change/formatter.cc
+++ b/src/songchange/formatter.cc
diff --git a/src/song_change/formatter.h b/src/songchange/formatter.h
index 196fbc3..196fbc3 100644
--- a/src/song_change/formatter.h
+++ b/src/songchange/formatter.h
diff --git a/src/song_change/song_change.cc b/src/songchange/song_change.cc
index fdca5bc..fdca5bc 100644
--- a/src/song_change/song_change.cc
+++ b/src/songchange/song_change.cc
diff --git a/src/sox-resampler/Makefile b/src/soxr/Makefile
index bc3bcd9..bc3bcd9 100644
--- a/src/sox-resampler/Makefile
+++ b/src/soxr/Makefile
diff --git a/src/sox-resampler/sox-resampler.cc b/src/soxr/sox-resampler.cc
index 43cbe61..6e6bf91 100644
--- a/src/sox-resampler/sox-resampler.cc
+++ b/src/soxr/sox-resampler.cc
@@ -61,9 +61,10 @@ public:
 EXPORT SoXResampler aud_plugin_instance;
 
 const char * const SoXResampler::defaults[] = {
- "quality", aud::numeric_string<SOXR_HQ>::str,
- "rate", "44100",
- nullptr};
+    "quality", aud::numeric_string<SOXR_HQ>::str,
+    "rate", "44100",
+    nullptr
+};
 
 static soxr_t soxr;
 static soxr_error_t error;
@@ -95,13 +96,13 @@ void SoXResampler::start (int & channels, int & rate)
     if (new_rate == rate)
         return;
 
-    soxr_quality_spec_t q = soxr_quality_spec(aud_get_int ("soxr", "quality"), 0);
+    soxr_quality_spec_t q = soxr_quality_spec (aud_get_int ("soxr", "quality"), 0);
 
-    soxr = soxr_create(rate, new_rate, channels, & error, nullptr, & q, nullptr);
+    soxr = soxr_create (rate, new_rate, channels, & error, nullptr, & q, nullptr);
 
     if (error)
     {
-        AUDERR (error);
+        AUDERR ("%s\n", error);
         return;
     }
 
@@ -123,7 +124,7 @@ Index<float> & SoXResampler::process (Index<float> & data)
 
     if (error)
     {
-        AUDERR (error);
+        AUDERR ("%s\n", error);
         return data;
     }
 
@@ -134,8 +135,8 @@ Index<float> & SoXResampler::process (Index<float> & data)
 
 bool SoXResampler::flush (bool force)
 {
-    if (soxr && (error = soxr_process(soxr, nullptr, 0, nullptr, nullptr, 0, nullptr)))
-        AUDERR (error);
+    if (soxr && (error = soxr_process (soxr, nullptr, 0, nullptr, nullptr, 0, nullptr)))
+        AUDERR ("%s\n", error);
 
     return true;
 }
diff --git a/src/speed-pitch/Makefile b/src/speedpitch/Makefile
index 41a00d5..41a00d5 100644
--- a/src/speed-pitch/Makefile
+++ b/src/speedpitch/Makefile
diff --git a/src/speed-pitch/speed-pitch.cc b/src/speedpitch/speed-pitch.cc
index 17acca4..81a42fc 100644
--- a/src/speed-pitch/speed-pitch.cc
+++ b/src/speedpitch/speed-pitch.cc
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <samplerate.h>
 
+#include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/plugin.h>
@@ -39,6 +40,8 @@
 #define MAXSPEED 2.0
 #define MINPITCH 0.5
 #define MAXPITCH 2.0
+#define MINSEMITONES -12.0
+#define MAXSEMITONES 12.0
 
 class SpeedPitch : public EffectPlugin
 {
@@ -74,6 +77,7 @@ private:
 
 EXPORT SpeedPitch aud_plugin_instance;
 
+static double semitones;
 static int curchans, currate;
 static SRC_STATE * srcstate;
 static int outstep, width;
@@ -201,6 +205,18 @@ int SpeedPitch::adjust_delay (int delay)
     return (delay + in_samples * samples_to_ms) * speed + out_samples * samples_to_ms;
 }
 
+static void pitch_changed ()
+{
+    semitones = 12 * log (aud_get_double (CFGSECT, "pitch")) / log (2);
+    hook_call ("speed-pitch set semitones", nullptr);
+}
+
+static void semitones_changed ()
+{
+    aud_set_double (CFGSECT, "pitch", pow (2, semitones / 12));
+    hook_call ("speed-pitch set pitch", nullptr);
+}
+
 const char * const SpeedPitch::defaults[] = {
  "speed", "1",
  "pitch", "1",
@@ -212,8 +228,12 @@ const PreferencesWidget SpeedPitch::widgets[] = {
         WidgetFloat (CFGSECT, "speed"),
         {MINSPEED, MAXSPEED, 0.05}),
     WidgetSpin (N_("Pitch:"),
-        WidgetFloat (CFGSECT, "pitch"),
-        {MINPITCH, MAXPITCH, 0.05})
+        WidgetFloat (CFGSECT, "pitch", pitch_changed, "speed-pitch set pitch"),
+        {MINPITCH, MAXPITCH, 0.005}),
+    WidgetSpin (nullptr,
+        WidgetFloat (semitones, semitones_changed, "speed-pitch set semitones"),
+        {MINSEMITONES, MAXSEMITONES, 0.05, N_("semitones")},
+        WIDGET_CHILD)
 };
 
 const PluginPreferences SpeedPitch::prefs = {{widgets}};
@@ -221,6 +241,7 @@ const PluginPreferences SpeedPitch::prefs = {{widgets}};
 bool SpeedPitch::init ()
 {
     aud_config_set_defaults (CFGSECT, defaults);
+    pitch_changed ();
     return true;
 }
 
diff --git a/src/statusicon-qt/statusicon.cc b/src/statusicon-qt/statusicon.cc
index d1218a9..f72b874 100644
--- a/src/statusicon-qt/statusicon.cc
+++ b/src/statusicon-qt/statusicon.cc
@@ -17,7 +17,6 @@
  * the use of this software.
  */
 
-#define AUD_PLUGIN_QT_ONLY
 #include <libaudcore/i18n.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
@@ -44,7 +43,8 @@ public:
         N_("Status Icon"),
         PACKAGE,
         about,
-        & prefs
+        & prefs,
+        PluginQtOnly
     };
 
     constexpr StatusIcon () : GeneralPlugin (info, false) {}
diff --git a/src/statusicon/statusicon.cc b/src/statusicon/statusicon.cc
index 152111f..07b6661 100644
--- a/src/statusicon/statusicon.cc
+++ b/src/statusicon/statusicon.cc
@@ -22,7 +22,6 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#define AUD_PLUGIN_GLIB_ONLY
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
@@ -48,7 +47,8 @@ public:
         N_("Status Icon"),
         PACKAGE,
         about,
-        & prefs
+        & prefs,
+        PluginGLibOnly
     };
 
     constexpr StatusIcon () : GeneralPlugin (info, false) {}
diff --git a/src/tonegen/tonegen.cc b/src/tonegen/tonegen.cc
index 9d9c9ef..b2a610d 100644
--- a/src/tonegen/tonegen.cc
+++ b/src/tonegen/tonegen.cc
@@ -47,13 +47,11 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo()
-        .with_schemes(schemes);
-
-    constexpr ToneGen() : InputPlugin(info, iinfo) {}
+    constexpr ToneGen() : InputPlugin(info, InputInfo()
+        .with_schemes(schemes)) {}
 
     bool is_our_file(const char *filename, VFSFile &file);
-    Tuple read_tuple(const char *filename, VFSFile &file);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
     bool play(const char *filename, VFSFile &file);
 };
 
@@ -148,12 +146,14 @@ bool ToneGen::play(const char *filename, VFSFile &file)
     return true;
 }
 
-Tuple ToneGen::read_tuple(const char *filename, VFSFile &file)
+bool ToneGen::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-    Tuple tuple;
-    tuple.set_filename(filename);
-    tuple.set_str(Tuple::Title, tone_title(filename));
-    return tuple;
+    StringBuf title = tone_title(filename);
+    if (!title)
+        return false;
+
+    tuple.set_str(Tuple::Title, title);
+    return true;
 }
 
 const char ToneGen::about[] =
diff --git a/src/ui-common/menu-ops-gtk.cc b/src/ui-common/menu-ops-gtk.cc
new file mode 100644
index 0000000..2d85982
--- /dev/null
+++ b/src/ui-common/menu-ops-gtk.cc
@@ -0,0 +1,133 @@
+/*
+ * menu-ops-gtk.cc
+ * Copyright 2016 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.
+ */
+
+#include "menu-ops.h"
+
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudgui/libaudgui.h>
+
+static void uri_get_func (GtkClipboard *, GtkSelectionData * sel, unsigned, void * data)
+    { gtk_selection_data_set_uris (sel, (char * *) data); }
+static void uri_clear_func (GtkClipboard *, void * data)
+    { g_strfreev ((char * *) data); }
+
+void pl_copy ()
+{
+    int list = aud_playlist_get_active ();
+    int entries = aud_playlist_entry_count (list);
+    int selected = aud_playlist_selected_count (list);
+    int fetched = 0;
+
+    if (! selected)
+        return;
+
+    aud_playlist_cache_selected (list);
+
+    char * * uris = g_new (char *, selected + 1);
+
+    for (int i = 0; i < entries && fetched < selected; i ++)
+    {
+        if (aud_playlist_entry_get_selected (list, i))
+            uris[fetched ++] = g_strdup (aud_playlist_entry_get_filename (list, i));
+    }
+
+    uris[fetched] = nullptr;
+
+    GtkTargetList * tlist = gtk_target_list_new (nullptr, 0);
+    gtk_target_list_add_uri_targets (tlist, 0);
+
+    GtkTargetEntry * targets; int n_targets;
+    targets = gtk_target_table_new_from_list (tlist, & n_targets);
+
+    gtk_clipboard_set_with_data (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+     targets, n_targets, uri_get_func, uri_clear_func, uris);
+
+    gtk_target_table_free (targets, n_targets);
+    gtk_target_list_unref (tlist);
+}
+
+void pl_cut ()
+{
+    pl_copy ();
+    pl_remove_selected ();
+}
+
+static void paste_to (int list, int pos)
+{
+    char * * uris = gtk_clipboard_wait_for_uris (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
+    if (! uris)
+        return;
+
+    Index<PlaylistAddItem> items;
+    for (int i = 0; uris[i]; i ++)
+        items.append (String (uris[i]));
+
+    aud_playlist_entry_insert_batch (list, pos, std::move (items), false);
+    g_strfreev (uris);
+}
+
+void pl_paste ()
+{
+    int list = aud_playlist_get_active ();
+    paste_to (list, aud_playlist_get_focus (list));
+}
+
+void pl_paste_end ()
+{
+    paste_to (aud_playlist_get_active (), -1);
+}
+
+void pl_song_info ()
+{
+    int list = aud_playlist_get_active ();
+    int focus = aud_playlist_get_focus (list);
+    if (focus >= 0)
+        audgui_infowin_show (list, focus);
+}
+
+void pl_open_folder ()
+{
+    int list = aud_playlist_get_active ();
+    int focus = aud_playlist_get_focus (list);
+
+    String filename = aud_playlist_entry_get_filename (list, focus);
+    if (! filename)
+        return;
+
+    const char * slash = strrchr (filename, '/');
+    if (! slash)
+        return;
+
+    /* don't trim trailing slash, it may be important */
+    StringBuf folder = str_copy (filename, slash + 1 - filename);
+
+    GError * error = nullptr;
+    gtk_show_uri (gdk_screen_get_default (), folder, GDK_CURRENT_TIME, & error);
+
+    if (error)
+    {
+        aud_ui_show_error (error->message);
+        g_error_free (error);
+    }
+}
diff --git a/src/ui-common/menu-ops-qt.cc b/src/ui-common/menu-ops-qt.cc
new file mode 100644
index 0000000..f603e5a
--- /dev/null
+++ b/src/ui-common/menu-ops-qt.cc
@@ -0,0 +1,107 @@
+/*
+ * menu-ops-qt.cc
+ * Copyright 2016 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.
+ */
+
+#include "menu-ops.h"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QDesktopServices>
+#include <QMimeData>
+#include <QUrl>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/libaudqt.h>
+
+void pl_copy ()
+{
+    int list = aud_playlist_get_active ();
+    int entries = aud_playlist_entry_count (list);
+
+    if (! aud_playlist_selected_count (list))
+        return;
+
+    aud_playlist_cache_selected (list);
+
+    QList<QUrl> urls;
+    for (int i = 0; i < entries; i ++)
+    {
+        if (aud_playlist_entry_get_selected (list, i))
+            urls.append (QString (aud_playlist_entry_get_filename (list, i)));
+    }
+
+    auto data = new QMimeData;
+    data->setUrls (urls);
+    QApplication::clipboard ()->setMimeData (data);
+}
+
+void pl_cut ()
+{
+    pl_copy ();
+    pl_remove_selected ();
+}
+
+static void paste_to (int list, int pos)
+{
+    auto data = QApplication::clipboard ()->mimeData ();
+    if (! data->hasUrls ())
+        return;
+
+    Index<PlaylistAddItem> items;
+    for (auto & url : data->urls ())
+        items.append (String (url.toEncoded ()));
+
+    aud_playlist_entry_insert_batch (list, pos, std::move (items), false);
+}
+
+void pl_paste ()
+{
+    int list = aud_playlist_get_active ();
+    paste_to (list, aud_playlist_get_focus (list));
+}
+
+void pl_paste_end ()
+{
+    paste_to (aud_playlist_get_active (), -1);
+}
+
+void pl_song_info ()
+{
+    int list = aud_playlist_get_active ();
+    int focus = aud_playlist_get_focus (list);
+    if (focus >= 0)
+        audqt::infowin_show (list, focus);
+}
+
+void pl_open_folder ()
+{
+    int list = aud_playlist_get_active ();
+    int focus = aud_playlist_get_focus (list);
+
+    String filename = aud_playlist_entry_get_filename (list, focus);
+    if (! filename)
+        return;
+
+    const char * slash = strrchr (filename, '/');
+    if (! slash)
+        return;
+
+    /* don't trim trailing slash, it may be important */
+    QDesktopServices::openUrl (QString::fromUtf8 (filename, slash + 1 - filename));
+}
diff --git a/src/ui-common/menu-ops.cc b/src/ui-common/menu-ops.cc
new file mode 100644
index 0000000..cd2dc71
--- /dev/null
+++ b/src/ui-common/menu-ops.cc
@@ -0,0 +1,128 @@
+/*
+ * menu-ops.cc
+ * Copyright 2016 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.
+ */
+
+#include <libaudcore/drct.h>
+#include <libaudcore/playlist.h>
+
+#define ACTIVE aud_playlist_get_active ()
+
+void rm_dupes_title () { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Title); }
+void rm_dupes_filename () { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Filename); }
+void rm_dupes_path () { aud_playlist_remove_duplicates_by_scheme (ACTIVE, Playlist::Path); }
+
+void sort_track () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Track); }
+void sort_title () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Title); }
+void sort_artist () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Artist); }
+void sort_album () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Album); }
+void sort_album_artist () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::AlbumArtist); }
+void sort_date () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Date); }
+void sort_genre () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Genre); }
+void sort_length () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Length); }
+void sort_path () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Path); }
+void sort_filename () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::Filename); }
+void sort_custom_title () { aud_playlist_sort_by_scheme (ACTIVE, Playlist::FormattedTitle); }
+void sort_reverse () { aud_playlist_reverse (ACTIVE); }
+void sort_random () { aud_playlist_randomize (ACTIVE); }
+
+void sort_sel_track () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Track); }
+void sort_sel_title () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Title); }
+void sort_sel_artist () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Artist); }
+void sort_sel_album () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Album); }
+void sort_sel_album_artist () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::AlbumArtist); }
+void sort_sel_date () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Date); }
+void sort_sel_genre () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Genre); }
+void sort_sel_length () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Length); }
+void sort_sel_path () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Path); }
+void sort_sel_filename () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::Filename); }
+void sort_sel_custom_title () { aud_playlist_sort_selected_by_scheme (ACTIVE, Playlist::FormattedTitle); }
+void sort_sel_reverse () { aud_playlist_reverse_selected (ACTIVE); }
+void sort_sel_random () { aud_playlist_randomize_selected (ACTIVE); }
+
+void pl_prev ()
+{
+    int list = aud_playlist_get_active ();
+    aud_playlist_set_active (list > 0 ? list - 1 : aud_playlist_count () - 1);
+}
+
+void pl_next ()
+{
+    aud_playlist_set_active ((aud_playlist_get_active () + 1) % aud_playlist_count ());
+}
+
+void pl_play () { aud_playlist_play (ACTIVE); }
+
+void pl_select_all () { aud_playlist_select_all (ACTIVE, true); }
+void pl_select_none () { aud_playlist_select_all (ACTIVE, false); }
+void pl_refresh () { aud_playlist_rescan (ACTIVE); }
+void pl_refresh_sel () { aud_playlist_rescan_selected (ACTIVE); }
+void pl_remove_failed () { aud_playlist_remove_failed (ACTIVE); }
+void pl_remove_selected () { aud_playlist_delete_selected (ACTIVE); }
+
+void pl_queue_clear ()
+{
+    int list = aud_playlist_get_active ();
+    aud_playlist_queue_delete (list, 0, aud_playlist_queue_count (list));
+}
+
+void pl_queue_toggle ()
+{
+    int list = aud_playlist_get_active ();
+    int focus = aud_playlist_get_focus (list);
+    if (focus < 0)
+        return;
+
+    /* make sure focused row is selected */
+    if (! aud_playlist_entry_get_selected (list, focus))
+    {
+        aud_playlist_select_all (list, false);
+        aud_playlist_entry_set_selected (list, focus, true);
+    }
+
+    int at = aud_playlist_queue_find_entry (list, focus);
+    if (at < 0)
+        aud_playlist_queue_insert_selected (list, -1);
+    else
+        aud_playlist_queue_delete_selected (list);
+}
+
+void pl_select_invert ()
+{
+    int list = aud_playlist_get_active ();
+    int entries = aud_playlist_entry_count (list);
+
+    for (int entry = 0; entry < entries; entry ++)
+        aud_playlist_entry_set_selected (list, entry,
+         ! aud_playlist_entry_get_selected (list, entry));
+}
+
+void pl_remove_all ()
+{
+    int list = aud_playlist_get_active ();
+    aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
+}
+
+void pl_remove_unselected ()
+{
+    pl_select_invert ();
+    pl_remove_selected ();
+    pl_select_all ();
+}
+
+void volume_up () { aud_drct_set_volume_main (aud_drct_get_volume_main () + 5); }
+void volume_down () { aud_drct_set_volume_main (aud_drct_get_volume_main () - 5); }
diff --git a/src/ui-common/menu-ops.h b/src/ui-common/menu-ops.h
new file mode 100644
index 0000000..b7bcfc7
--- /dev/null
+++ b/src/ui-common/menu-ops.h
@@ -0,0 +1,90 @@
+/*
+ * menu-ops.h
+ * Copyright 2016 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.
+ */
+
+#ifndef UI_COMMON_MENU_OPS_H
+#define UI_COMMON_MENU_OPS_H
+
+// remove duplicate playlist entries
+void rm_dupes_title ();
+void rm_dupes_filename ();
+void rm_dupes_path ();
+
+// sort entire playlist
+void sort_track ();
+void sort_title ();
+void sort_artist ();
+void sort_album ();
+void sort_album_artist ();
+void sort_date ();
+void sort_genre ();
+void sort_length ();
+void sort_path ();
+void sort_filename ();
+void sort_custom_title ();
+void sort_reverse ();
+void sort_random ();
+
+// sort selected playlist entries
+void sort_sel_track ();
+void sort_sel_title ();
+void sort_sel_artist ();
+void sort_sel_album ();
+void sort_sel_album_artist ();
+void sort_sel_date ();
+void sort_sel_genre ();
+void sort_sel_length ();
+void sort_sel_path ();
+void sort_sel_filename ();
+void sort_sel_custom_title ();
+void sort_sel_reverse ();
+void sort_sel_random ();
+
+// playlist switching
+void pl_prev ();
+void pl_next ();
+void pl_play ();
+
+// playlist editing
+void pl_queue_clear ();
+void pl_queue_toggle ();
+void pl_select_all ();
+void pl_select_none ();
+void pl_select_invert ();
+void pl_refresh ();
+void pl_refresh_sel ();
+void pl_remove_all ();
+void pl_remove_failed ();
+void pl_remove_selected ();
+void pl_remove_unselected ();
+
+// clipboard
+void pl_copy ();
+void pl_cut ();
+void pl_paste ();
+void pl_paste_end ();
+
+// misc playlist
+void pl_song_info ();
+void pl_open_folder ();
+
+// volume control
+void volume_up ();
+void volume_down ();
+
+#endif // UI_COMMON_MENU_OPS_H
diff --git a/src/vorbis/vcedit.cc b/src/vorbis/vcedit.cc
index 188a4cb..5c6f465 100644
--- a/src/vorbis/vcedit.cc
+++ b/src/vorbis/vcedit.cc
@@ -3,11 +3,10 @@
  *
  * (c) 2000-2001 Michael Smith <msmith@labyrinth.net.au>
  *
- *
  * Comment editing backend, suitable for use by nice frontend interfaces.
  *
+ * Somewhat cleaned up for C++ by John Lindgren, 2015.
  */
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ogg/ogg.h>
@@ -17,70 +16,35 @@
 
 #define CHUNKSIZE 4096
 
-vcedit_state *
-vcedit_new_state()
-{
-    return g_new0(vcedit_state, 1);
-}
-
-const 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)
+VCEdit::VCEdit()
 {
-    if (state->vc) {
-        vorbis_comment_clear(state->vc);
-        g_free(state->vc);
-        state->vc = nullptr;
-    }
-    if (state->os) {
-        ogg_stream_clear(state->os);
-        g_free(state->os);
-        state->os = nullptr;
-    }
-    if (state->oy) {
-        ogg_sync_clear(state->oy);
-        g_free(state->oy);
-        state->oy = nullptr;
-    }
-    if (state->vendor) {
-        g_free(state->vendor);
-        state->vendor = nullptr;
-    }
+    ogg_sync_init(&oy);
+    ogg_stream_init(&os, 0);
+    vorbis_comment_init(&vc);
+    vorbis_info_init(&vi);
 }
 
-void
-vcedit_clear(vcedit_state * state)
+VCEdit::~VCEdit()
 {
-    if (state) {
-        vcedit_clear_internals(state);
-        g_free(state);
-    }
+    ogg_sync_clear(&oy);
+    ogg_stream_clear(&os);
+    vorbis_comment_clear(&vc);
+    vorbis_info_clear(&vi);
 }
 
 /* Next two functions pulled straight from libvorbis, apart from one change
  * - we don't want to overwrite the vendor string.
  */
 static void
-_v_writestring(oggpack_buffer * o, const char *s, int len)
+_v_writestring(oggpack_buffer *o, const char *s, int len)
 {
     while (len--) {
         oggpack_write(o, *s++, 8);
     }
 }
 
-static int
-_commentheader_out(vorbis_comment * vc, char *vendor, ogg_packet * op)
+static void
+_commentheader_out(vorbis_comment *vc, const char *vendor, ogg_packet *op)
 {
     oggpack_buffer opb;
 
@@ -118,141 +82,113 @@ _commentheader_out(vorbis_comment * vc, char *vendor, ogg_packet * op)
     op->b_o_s = 0;
     op->e_o_s = 0;
     op->granulepos = 0;
-
-    return 0;
 }
 
-static int
-_blocksize(vcedit_state * s, ogg_packet * p)
+int VCEdit::blocksize(ogg_packet *p)
 {
-    int size = vorbis_packet_blocksize(&s->vi, p);
-    int ret = (size + s->prevW) / 4;
+    int size = vorbis_packet_blocksize(&vi, p);
+    int ret = (size + prevW) / 4;
 
-    if (!s->prevW) {
-        s->prevW = size;
+    if (!prevW) {
+        prevW = size;
         return 0;
     }
 
-    s->prevW = size;
+    prevW = size;
     return ret;
 }
 
-static int
-_fetch_next_packet(vcedit_state * s, ogg_packet * p, ogg_page * page)
+bool VCEdit::fetch_next_packet(VFSFile &in, ogg_packet *p, ogg_page *page)
 {
-    int result;
-    char *buffer;
-    int64_t bytes;
-
-    result = ogg_stream_packetout(s->os, p);
-
-    if (result > 0)
-        return 1;
+    if (ogg_stream_packetout(&os, p) > 0)
+        return true;
     else {
-        if (s->eosin)
-            return 0;
-        while (ogg_sync_pageout(s->oy, page) <= 0) {
-            buffer = ogg_sync_buffer(s->oy, CHUNKSIZE);
-            bytes = s->in->fread(buffer, 1, CHUNKSIZE);
-            ogg_sync_wrote(s->oy, bytes);
+        if (eosin)
+            return false;
+        while (ogg_sync_pageout(&oy, page) <= 0) {
+            char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+            int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
+            ogg_sync_wrote(&oy, bytes);
             if (bytes == 0)
-                return 0;
+                return false;
         }
         if (ogg_page_eos(page))
-            s->eosin = 1;
-        else if (ogg_page_serialno(page) != s->serial) {
-            s->eosin = 1;
-            s->extrapage = 1;
-            return 0;
+            eosin = true;
+        else if (ogg_page_serialno(page) != serial) {
+            eosin = true;
+            extrapage = true;
+            return false;
         }
 
-        ogg_stream_pagein(s->os, page);
-        return _fetch_next_packet(s, p, page);
+        ogg_stream_pagein(&os, page);
+        return fetch_next_packet(in, p, page);
     }
 }
 
-
-int
-vcedit_open(vcedit_state * state, VFSFile & in)
+bool VCEdit::open(VFSFile &in)
 {
-    char *buffer;
-    int64_t bytes, i;
-    ogg_packet *header;
     ogg_packet header_main;
     ogg_packet header_comments;
     ogg_packet header_codebooks;
     ogg_page og;
 
-    state->in = & in;
-
-    state->oy = g_new(ogg_sync_state, 1);
-    ogg_sync_init(state->oy);
-
-    buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
+    char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
 
-    bytes = state->in->fread(buffer, 1, CHUNKSIZE);
+    int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
 
-    ogg_sync_wrote(state->oy, bytes);
+    ogg_sync_wrote(&oy, bytes);
 
-    if (ogg_sync_pageout(state->oy, &og) != 1) {
+    if (ogg_sync_pageout(&oy, &og) != 1) {
         if (bytes < CHUNKSIZE)
-            state->lasterror = "Input truncated or empty.";
+            lasterror = "Input truncated or empty.";
         else
-            state->lasterror = "Input is not an Ogg bitstream.";
-        goto err;
+            lasterror = "Input is not an Ogg bitstream.";
+        return false;
     }
 
-    state->serial = ogg_page_serialno(&og);
+    serial = ogg_page_serialno(&og);
 
-    state->os = g_new(ogg_stream_state, 1);
-    ogg_stream_init(state->os, state->serial);
+    ogg_stream_reset_serialno(&os, serial);
 
-    vorbis_info_init(&state->vi);
-
-    state->vc = g_new(vorbis_comment, 1);
-    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_pagein(&os, &og) < 0) {
+        lasterror = "Error reading first page of Ogg bitstream.";
+        return false;
     }
 
-    if (ogg_stream_packetout(state->os, &header_main) != 1) {
-        state->lasterror = "Error reading initial header packet.";
-        goto err;
+    if (ogg_stream_packetout(&os, &header_main) != 1) {
+        lasterror = "Error reading initial header packet.";
+        return false;
     }
 
-    if (vorbis_synthesis_headerin(&state->vi, state->vc, &header_main) < 0) {
-        state->lasterror = "Ogg bitstream does not contain vorbis data.";
-        goto err;
+    if (vorbis_synthesis_headerin(&vi, &vc, &header_main) < 0) {
+        lasterror = "Ogg bitstream does not contain vorbis data.";
+        return false;
     }
 
-    state->mainlen = header_main.bytes;
-    state->mainbuf = g_new (unsigned char, state->mainlen);
-    memcpy(state->mainbuf, header_main.packet, header_main.bytes);
+    mainbuf.clear();
+    mainbuf.insert(header_main.packet, 0, header_main.bytes);
 
-    i = 0;
-    header = &header_comments;
+    int i = 0;
+    ogg_packet *header = &header_comments;
     while (i < 2) {
         while (i < 2) {
-            int result = ogg_sync_pageout(state->oy, &og);
+            int result = ogg_sync_pageout(&oy, &og);
             if (result == 0)
                 break;          /* Too little data so far */
             else if (result == 1) {
-                ogg_stream_pagein(state->os, &og);
+                ogg_stream_pagein(&os, &og);
                 while (i < 2) {
-                    result = ogg_stream_packetout(state->os, header);
+                    result = ogg_stream_packetout(&os, header);
                     if (result == 0)
                         break;
                     if (result == -1) {
-                        state->lasterror = "Corrupt secondary header.";
-                        goto err;
+                        lasterror = "Corrupt secondary header.";
+                        return false;
                     }
-                    vorbis_synthesis_headerin(&state->vi, state->vc, header);
+                    vorbis_synthesis_headerin(&vi, &vc, header);
                     if (i == 1) {
-                        state->booklen = header->bytes;
-                        state->bookbuf = g_new (unsigned char, state->booklen);
-                        memcpy(state->bookbuf, header->packet, header->bytes);
+                        bookbuf.clear();
+                        bookbuf.insert(header->packet, 0, header->bytes);
                     }
                     i++;
                     header = &header_codebooks;
@@ -260,37 +196,24 @@ vcedit_open(vcedit_state * state, VFSFile & in)
             }
         }
 
-        buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-        bytes = state->in->fread(buffer, 1, CHUNKSIZE);
+        buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+        bytes = in.fread(buffer, 1, CHUNKSIZE);
         if (bytes == 0 && i < 2) {
-            state->lasterror = "EOF before end of vorbis headers.";
-            goto err;
+            lasterror = "EOF before end of vorbis headers.";
+            return false;
         }
-        ogg_sync_wrote(state->oy, bytes);
+        ogg_sync_wrote(&oy, bytes);
     }
 
     /* Copy the vendor tag */
-    state->vendor = g_strdup (state->vc->vendor);
+    vendor = String(vc.vendor);
 
     /* Headers are done! */
-    return 0;
-
-  err:
-    vcedit_clear_internals(state);
-    return -1;
+    return true;
 }
 
-#if 0
-static void
-dump_state(vcedit_state * state)
+bool VCEdit::write(VFSFile &in, VFSFile &out)
 {
-}
-#endif
-
-int
-vcedit_write(vcedit_state * state, VFSFile & out)
-{
-
     ogg_stream_state streamout;
     ogg_packet header_main;
     ogg_packet header_comments;
@@ -299,45 +222,41 @@ vcedit_write(vcedit_state * state, VFSFile & out)
     ogg_page ogout, ogin;
     ogg_packet op;
     ogg_int64_t granpos = 0;
-    int result;
-    char *buffer;
-    int64_t bytes;
-    int needflush = 0, needout = 0;
+    bool needflush = false;
+    bool needout = false;
 
-    state->eosin = 0;
-    state->extrapage = 0;
+    eosin = false;
+    extrapage = false;
 
-    header_main.bytes = state->mainlen;
-    header_main.packet = state->mainbuf;
+    header_main.bytes = mainbuf.len();
+    header_main.packet = mainbuf.begin();
     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.bytes = bookbuf.len();
+    header_codebooks.packet = bookbuf.begin();
     header_codebooks.b_o_s = 0;
     header_codebooks.e_o_s = 0;
     header_codebooks.granulepos = 0;
 
-    ogg_stream_init(&streamout, state->serial);
+    ogg_stream_init(&streamout, serial);
 
-    _commentheader_out(state->vc, state->vendor, &header_comments);
+    _commentheader_out(&vc, 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))) {
+    while (ogg_stream_flush(&streamout, &ogout)) {
         if (out.fwrite(ogout.header, 1, ogout.header_len) != ogout.header_len)
             goto cleanup;
         if (out.fwrite(ogout.body, 1, ogout.body_len) != ogout.body_len)
             goto cleanup;
     }
 
-    while (_fetch_next_packet(state, &op, &ogin)) {
-        int size;
-        size = _blocksize(state, &op);
-        granpos += size;
+    while (fetch_next_packet(in, &op, &ogin)) {
+        granpos += blocksize(&op);
 
         if (needflush) {
             if (ogg_stream_flush(&streamout, &ogout)) {
@@ -356,7 +275,8 @@ vcedit_write(vcedit_state * state, VFSFile & out)
             }
         }
 
-        needflush = needout = 0;
+        needflush = false;
+        needout = false;
 
         if (op.granulepos == -1) {
             op.granulepos = granpos;
@@ -367,11 +287,11 @@ vcedit_write(vcedit_state * state, VFSFile & out)
             if (granpos > op.granulepos) {
                 granpos = op.granulepos;
                 ogg_stream_packetin(&streamout, &op);
-                needflush = 1;
+                needflush = true;
             }
             else {
                 ogg_stream_packetin(&streamout, &op);
-                needout = 1;
+                needout = true;
             }
         }
     }
@@ -384,27 +304,23 @@ vcedit_write(vcedit_state * state, VFSFile & out)
             goto cleanup;
     }
 
-    /* FIXME: freeing this here probably leaks memory */
-    /* Done with this, now */
-    vorbis_info_clear(&state->vi);
-
-    if (state->extrapage) {
+    if (extrapage) {
         if (out.fwrite(ogin.header, 1, ogin.header_len) != ogin.header_len)
             goto cleanup;
         if (out.fwrite(ogin.body, 1, ogin.body_len) != 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 */
+    eosin = false;       /* clear it, because not all paths to here do */
+    while (!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);
+            int result = ogg_sync_pageout(&oy, &ogout);
             if (result == 0)
                 break;
             if (result < 0)
-                state->lasterror = "Corrupt or missing data, continuing...";
+                lasterror = "Corrupt or missing data, continuing...";
             else {
                 /* Don't bother going through the rest, we can just
                  * write the page out now */
@@ -414,30 +330,25 @@ vcedit_write(vcedit_state * state, VFSFile & out)
                     goto cleanup;
             }
         }
-        buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-        bytes = state->in->fread(buffer, 1, CHUNKSIZE);
-        ogg_sync_wrote(state->oy, bytes);
+        char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+        int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
+        ogg_sync_wrote(&oy, bytes);
         if (bytes == 0) {
-            state->eosin = 1;
+            eosin = true;
             break;
         }
     }
 
-
   cleanup:
     ogg_stream_clear(&streamout);
     ogg_packet_clear(&header_comments);
 
-    g_free(state->mainbuf);
-    g_free(state->bookbuf);
-
-    vcedit_clear_internals(state);
-    if (!state->eosin) {
-        state->lasterror =
+    if (!eosin) {
+        lasterror =
             "Error writing stream to output. "
             "Output stream may be corrupted or truncated.";
-        return -1;
+        return false;
     }
 
-    return 0;
+    return true;
 }
diff --git a/src/vorbis/vcedit.h b/src/vorbis/vcedit.h
index 5473b84..ee3d37f 100644
--- a/src/vorbis/vcedit.h
+++ b/src/vorbis/vcedit.h
@@ -14,32 +14,39 @@
 #include <vorbis/codec.h>
 #include <libaudcore/vfs.h>
 
-typedef struct {
-	ogg_sync_state	 *oy;
-	ogg_stream_state *os;
-
-	vorbis_comment	 *vc;
-	vorbis_info       vi;
-
-	VFSFile		 *in;
-	long		  serial;
-	unsigned char	 *mainbuf;
-	unsigned char	 *bookbuf;
-	int		  mainlen;
-	int		  booklen;
-	const char 	         *lasterror;
-	char             *vendor;
-	int               prevW;
-	int               extrapage;
-	int               eosin;
-} vcedit_state;
-
-extern vcedit_state *vcedit_new_state();
-extern void vcedit_clear(vcedit_state *state);
-extern vorbis_comment *vcedit_comments(vcedit_state *state);
-extern int vcedit_open(vcedit_state *state, VFSFile &in);
-extern int vcedit_write(vcedit_state *state, VFSFile &out);
-extern const char *vcedit_error(vcedit_state *state);
+class VCEdit
+{
+public:
+    vorbis_comment vc;
+    const char *lasterror = nullptr;
+
+    VCEdit();
+    ~VCEdit();
+
+    VCEdit(const VCEdit&) = delete;
+    VCEdit& operator=(const VCEdit&) = delete;
+
+    bool open(VFSFile &in);
+    bool write(VFSFile &in, VFSFile &out);
+
+private:
+    ogg_sync_state   oy;
+    ogg_stream_state os;
+    vorbis_info      vi;
+
+    long serial = 0;
+    int  prevW = 0;
+    bool extrapage = false;
+    bool eosin = false;
+
+    String vendor;
+
+    Index<unsigned char> mainbuf;
+    Index<unsigned char> bookbuf;
+
+    int blocksize(ogg_packet *p);
+    bool fetch_next_packet(VFSFile &in, ogg_packet *p, ogg_page *page);
+};
 
 #endif /* __VCEDIT_H */
 
diff --git a/src/vorbis/vcupdate.cc b/src/vorbis/vcupdate.cc
index bb4d62e..2be5b7e 100644
--- a/src/vorbis/vcupdate.cc
+++ b/src/vorbis/vcupdate.cc
@@ -27,9 +27,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/multihash.h>
@@ -38,8 +35,6 @@
 #include "vorbis.h"
 #include "vcedit.h"
 
-static bool write_and_pivot_files(vcedit_state * state);
-
 typedef SimpleHash<String, String> Dictionary;
 
 static Dictionary dictionary_from_vorbis_comment (vorbis_comment * vc)
@@ -48,19 +43,12 @@ static Dictionary dictionary_from_vorbis_comment (vorbis_comment * vc)
 
     for (int i = 0; i < vc->comments; i ++)
     {
-        char **frags;
-
-        AUDDBG("%s\n", vc->user_comments[i]);
-        frags = g_strsplit(vc->user_comments[i], "=", 2);
+        const char * s = vc->user_comments[i];
+        AUDDBG("%s\n", s);
 
-        if (frags[0] && frags[1])
-        {
-            char * key = g_ascii_strdown (frags[0], -1);
-            dict.add (String (key), String (frags[1]));
-            g_free (key);
-        }
-
-        g_strfreev(frags); /* Don't use g_free() for string lists! --eugene */
+        const char * eq = strchr (s, '=');
+        if (eq && eq > s && eq[1])
+            dict.add (String (str_tolower (str_copy (s, eq - s))), String (eq + 1));
     }
 
     return dict;
@@ -73,7 +61,7 @@ static void add_tag_cb (const String & key, String & field, void * vc)
 
 static void dictionary_to_vorbis_comment (vorbis_comment * vc, Dictionary & dict)
 {
-    vorbis_comment_clear(vc);
+    vorbis_comment_clear (vc);
     dict.iterate (add_tag_cb, vc);
 }
 
@@ -101,109 +89,33 @@ static void insert_int_tuple_field_to_dictionary (const Tuple & tuple,
 
 bool VorbisPlugin::write_tuple (const char * filename, VFSFile & file, const Tuple & tuple)
 {
-    vcedit_state *state;
-    vorbis_comment *comment;
-    bool ret;
-
-    state = vcedit_new_state();
-
-    if(vcedit_open(state, file) < 0) {
-        vcedit_clear(state);
+    VCEdit edit;
+    if (! edit.open (file))
         return false;
-    }
-
-    comment = vcedit_comments(state);
-    Dictionary dict = dictionary_from_vorbis_comment (comment);
 
-    insert_str_tuple_field_to_dictionary(tuple, Tuple::Title, dict, "title");
-    insert_str_tuple_field_to_dictionary(tuple, Tuple::Artist, dict, "artist");
-    insert_str_tuple_field_to_dictionary(tuple, Tuple::Album, dict, "album");
-    insert_str_tuple_field_to_dictionary(tuple, Tuple::Comment, dict, "comment");
-    insert_str_tuple_field_to_dictionary(tuple, Tuple::Genre, dict, "genre");
+    Dictionary dict = dictionary_from_vorbis_comment (& edit.vc);
 
-    insert_int_tuple_field_to_dictionary(tuple, Tuple::Year, dict, "date");
-    insert_int_tuple_field_to_dictionary(tuple, Tuple::Track, dict, "tracknumber");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::Title, dict, "title");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::Artist, dict, "artist");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::Album, dict, "album");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::AlbumArtist, dict, "albumartist");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::Comment, dict, "comment");
+    insert_str_tuple_field_to_dictionary (tuple, Tuple::Genre, dict, "genre");
 
-    dictionary_to_vorbis_comment(comment, dict);
+    insert_int_tuple_field_to_dictionary (tuple, Tuple::Year, dict, "date");
+    insert_int_tuple_field_to_dictionary (tuple, Tuple::Track, dict, "tracknumber");
 
-    ret = write_and_pivot_files(state);
+    dictionary_to_vorbis_comment (& edit.vc, dict);
 
-    vcedit_clear(state);
-
-    return ret;
-}
-
-#define COPY_BUF 65536
-
-bool copy_vfs (VFSFile & in, VFSFile & out)
-{
-    if (in.fseek (0, VFS_SEEK_SET) < 0 || out.fseek (0, VFS_SEEK_SET) < 0)
+    auto temp_vfs = VFSFile::tmpfile ();
+    if (! temp_vfs)
         return false;
 
-    char * buffer = g_new (char, COPY_BUF);
-    int64_t size = 0, readed;
-
-    while ((readed = in.fread (buffer, 1, COPY_BUF)) > 0)
+    if (! edit.write (file, temp_vfs))
     {
-        if (out.fwrite (buffer, 1, readed) != readed)
-            goto FAILED;
-
-        size += readed;
-    }
-
-    if (out.ftruncate (size) < 0)
-        goto FAILED;
-
-    g_free (buffer);
-    return true;
-
-FAILED:
-    g_free (buffer);
-    return false;
-}
-
-#undef COPY_BUF
-
-bool write_and_pivot_files (vcedit_state * state)
-{
-    char * temp;
-    GError * error = nullptr;
-    int handle = g_file_open_tmp (nullptr, & temp, & error);
-
-    if (handle < 0)
-    {
-        AUDERR ("Failed to create temp file: %s.\n", error->message);
-        g_error_free (error);
-        return false;
-    }
-
-    close (handle);
-
-    StringBuf temp_uri = filename_to_uri (temp);
-    g_return_val_if_fail (temp_uri, false);
-    VFSFile temp_vfs (temp_uri, "r+");
-    g_return_val_if_fail (temp_vfs, false);
-
-    if (vcedit_write (state, temp_vfs) < 0)
-    {
-        AUDERR ("Tag update failed: %s.\n", state->lasterror);
-        g_free (temp);
+        AUDERR ("Tag update failed: %s.\n", edit.lasterror);
         return false;
     }
 
-    if (! copy_vfs (temp_vfs, * state->in))
-    {
-        AUDERR ("Failed to copy temp file.  The temp file has not "
-         "been deleted: %s.\n", temp);
-        g_free (temp);
-        return false;
-    }
-
-    temp_vfs = VFSFile ();
-
-    if (g_unlink (temp) < 0)
-        AUDERR ("Failed to delete temp file: %s.\n", temp);
-
-    g_free (temp);
-    return true;
+    return file.replace_with (temp_vfs);
 }
diff --git a/src/vorbis/vorbis.cc b/src/vorbis/vorbis.cc
index 71c86bb..a03b303 100644
--- a/src/vorbis/vorbis.cc
+++ b/src/vorbis/vorbis.cc
@@ -138,6 +138,7 @@ static void read_comment (vorbis_comment * comment, Tuple & tuple)
     set_tuple_str (tuple, Tuple::Title, comment, "title");
     set_tuple_str (tuple, Tuple::Artist, comment, "artist");
     set_tuple_str (tuple, Tuple::Album, comment, "album");
+    set_tuple_str (tuple, Tuple::AlbumArtist, comment, "albumartist");
     set_tuple_str (tuple, Tuple::Genre, comment, "genre");
     set_tuple_str (tuple, Tuple::Comment, comment, "comment");
 
@@ -314,7 +315,8 @@ play_cleanup:
     return ! error;
 }
 
-bool VorbisPlugin::read_tag (const char * filename, VFSFile & file, Tuple * tuple, Index<char> * image)
+bool VorbisPlugin::read_tag (const char * filename, VFSFile & file,
+ Tuple & tuple, Index<char> * image)
 {
     OggVorbis_File vfile;
 
@@ -329,20 +331,16 @@ bool VorbisPlugin::read_tag (const char * filename, VFSFile & file, Tuple * tupl
      vorbis_callbacks_stream : vorbis_callbacks) < 0)
         return false;
 
+    vorbis_info * info = ov_info (& vfile, -1);
     vorbis_comment * comment = ov_comment (& vfile, -1);
 
-    if (tuple)
-    {
-        vorbis_info * info = ov_info (& vfile, -1);
-        tuple->set_format ("Ogg Vorbis", info->channels, info->rate, info->bitrate_nominal / 1000);
-        tuple->set_str (Tuple::MIMEType, "application/ogg");
+    tuple.set_format ("Ogg Vorbis", info->channels, info->rate, info->bitrate_nominal / 1000);
 
-        if (! stream)
-            tuple->set_int (Tuple::Length, ov_time_total (& vfile, -1) * 1000);
+    if (! stream)
+        tuple.set_int (Tuple::Length, ov_time_total (& vfile, -1) * 1000);
 
-        if (comment)
-            read_comment (comment, * tuple);
-    }
+    if (comment)
+        read_comment (comment, tuple);
 
     if (image && comment)
         * image = read_image_from_comment (filename, comment);
diff --git a/src/vorbis/vorbis.h b/src/vorbis/vorbis.h
index e5684f0..4a1dbb7 100644
--- a/src/vorbis/vorbis.h
+++ b/src/vorbis/vorbis.h
@@ -20,15 +20,13 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo (FlagWritesTag)
+    constexpr VorbisPlugin () : InputPlugin (info, InputInfo (FlagWritesTag)
         .with_priority (2)  /* medium-high priority (a little slow) */
         .with_exts (exts)
-        .with_mimes (mimes);
-
-    constexpr VorbisPlugin () : InputPlugin (info, iinfo) {}
+        .with_mimes (mimes)) {}
 
     bool is_our_file (const char * filename, VFSFile & file);
-    bool read_tag (const char * filename, VFSFile & file, Tuple * tuple, Index<char> * image);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
     bool play (const char * filename, VFSFile & file);
 };
diff --git a/src/vtx/vtx.cc b/src/vtx/vtx.cc
index 038521b..9078b33 100644
--- a/src/vtx/vtx.cc
+++ b/src/vtx/vtx.cc
@@ -40,13 +40,11 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo()
-        .with_exts(exts);
-
-    constexpr VTXPlugin() : InputPlugin(info, iinfo) {}
+    constexpr VTXPlugin() : InputPlugin(info, InputInfo()
+        .with_exts(exts)) {}
 
     bool is_our_file(const char *filename, VFSFile &file);
-    Tuple read_tuple(const char *filename, VFSFile &file);
+    bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
     bool play(const char *filename, VFSFile &file);
 
 #ifdef USE_GTK
@@ -73,35 +71,27 @@ bool VTXPlugin::is_our_file(const char *filename, VFSFile &file)
     return (!strcmp_nocase(buf, "ay", 2) || !strcmp_nocase(buf, "ym", 2));
 }
 
-Tuple vtx_get_song_tuple_from_vtx(const char * filename, ayemu_vtx_t * in)
+bool VTXPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-    Tuple tuple;
-    tuple.set_filename (filename);
+    ayemu_vtx_t tmp;
 
-    tuple.set_str (Tuple::Artist, in->hdr.author);
-    tuple.set_str (Tuple::Title, in->hdr.title);
+    if (!tmp.read_header(file))
+        return false;
 
-    tuple.set_int (Tuple::Length, in->hdr.regdata_size / 14 * 1000 / 50);
+    tuple.set_str(Tuple::Artist, tmp.hdr.author);
+    tuple.set_str(Tuple::Title, tmp.hdr.title);
 
-    tuple.set_str (Tuple::Genre, (in->hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
-    tuple.set_str (Tuple::Album, in->hdr.from);
+    tuple.set_int(Tuple::Length, tmp.hdr.regdata_size / 14 * 1000 / 50);
 
-    tuple.set_str (Tuple::Quality, _("sequenced"));
-    tuple.set_str (Tuple::Codec, in->hdr.tracker);
+    tuple.set_str(Tuple::Genre, (tmp.hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
+    tuple.set_str(Tuple::Album, tmp.hdr.from);
 
-    tuple.set_int (Tuple::Year, in->hdr.year);
+    tuple.set_str(Tuple::Quality, _("sequenced"));
+    tuple.set_str(Tuple::Codec, tmp.hdr.tracker);
 
-    return tuple;
-}
+    tuple.set_int(Tuple::Year, tmp.hdr.year);
 
-Tuple VTXPlugin::read_tuple(const char *filename, VFSFile &file)
-{
-    ayemu_vtx_t tmp;
-
-    if (tmp.read_header(file))
-        return vtx_get_song_tuple_from_vtx(filename, &tmp);
-
-    return Tuple ();
+    return true;
 }
 
 bool VTXPlugin::play(const char *filename, VFSFile &file)
diff --git a/src/waveout/Makefile b/src/waveout/Makefile
new file mode 100644
index 0000000..ba15a74
--- /dev/null
+++ b/src/waveout/Makefile
@@ -0,0 +1,13 @@
+PLUGIN = waveout${PLUGIN_SUFFIX}
+
+SRCS = waveout.cc
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
+
+LD = ${CXX}
+CPPFLAGS += -I../..
+CXXFLAGS += ${PLUGIN_CFLAGS}
+LIBS += -lwinmm
diff --git a/src/waveout/waveout.cc b/src/waveout/waveout.cc
new file mode 100644
index 0000000..17c91be
--- /dev/null
+++ b/src/waveout/waveout.cc
@@ -0,0 +1,339 @@
+/*
+ * Win32 waveOut Plugin for Audacious
+ * Copyright 2016 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.
+ */
+
+#include <assert.h>
+#include <pthread.h>
+
+#include <windows.h>
+
+// missing from MinGW header
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+#define WAVE_FORMAT_IEEE_FLOAT 3
+#endif
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+#define NUM_BLOCKS 4
+
+class WaveOut : public OutputPlugin
+{
+public:
+    static const char about[];
+
+    static constexpr PluginInfo info = {
+        N_("Win32 waveOut"),
+        PACKAGE,
+        about
+    };
+
+    constexpr WaveOut () : OutputPlugin (info, 5) {}
+
+    StereoVolume get_volume ();
+    void set_volume (StereoVolume v);
+
+    bool open_audio (int aud_format, int rate, int chans, String & error);
+    void close_audio ();
+
+    void period_wait ();
+    int write_audio (const void * data, int size);
+    void drain ();
+
+    int get_delay ();
+
+    void pause (bool pause);
+    void flush ();
+};
+
+EXPORT WaveOut aud_plugin_instance;
+
+const char WaveOut::about[] =
+ N_("Win32 waveOut Plugin for Audacious\n"
+    "Copyright 2016 John Lindgren");
+
+// lock order is state, then buffer
+static pthread_mutex_t state_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t buffer_cond = PTHREAD_COND_INITIALIZER;
+
+static int waveout_format;
+static int waveout_chan, waveout_rate;
+static int block_size;
+
+// guarded by state_mutex
+static HWAVEOUT device;
+static bool prebuffer_flag, paused_flag;
+static int64_t total_frames;
+
+// guarded by buffer_mutex
+static Index<WAVEHDR> headers;
+static Index<Index<char>> blocks;
+static int next_block, blocks_free;
+
+StereoVolume WaveOut::get_volume ()
+{
+    DWORD vol = 0;
+    waveOutGetVolume ((HWAVEOUT) WAVE_MAPPER, & vol);
+    return {aud::rescale (int (vol & 0xffff), 0xffff, 100),
+            aud::rescale (int (vol >> 16), 0xffff, 100)};
+}
+
+void WaveOut::set_volume (StereoVolume v)
+{
+    int left = aud::rescale (v.left, 100, 0xffff);
+    int right = aud::rescale (v.right, 100, 0xffff);
+    waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, left | (right << 16));
+}
+
+static void CALLBACK callback (HWAVEOUT, UINT uMsg, DWORD_PTR, DWORD_PTR, DWORD_PTR)
+{
+    if (uMsg != WOM_DONE)
+        return;
+
+    pthread_mutex_lock (& buffer_mutex);
+
+    assert (blocks_free < NUM_BLOCKS);
+    int old_block = (next_block + blocks_free) % NUM_BLOCKS;
+    blocks[old_block].resize (0);
+    blocks_free ++;
+
+    pthread_cond_broadcast (& buffer_cond);
+    pthread_mutex_unlock (& buffer_mutex);
+}
+
+bool WaveOut::open_audio (int format, int rate, int chan, String & error)
+{
+    if (format != FMT_S16_NE && format != FMT_S32_NE && format != FMT_FLOAT)
+    {
+        error = String ("waveOut error: Unsupported audio format.  Supported "
+                        "bit depths are 16, 32, and floating point.");
+        return false;
+    }
+
+    AUDDBG ("Opening audio for format %d, %d channels, %d Hz.\n", format, chan, rate);
+
+    waveout_format = format;
+    waveout_chan = chan;
+    waveout_rate = rate;
+
+    WAVEFORMATEX desc;
+    desc.wFormatTag = (format == FMT_FLOAT) ? WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM;
+    desc.nChannels = chan;
+    desc.nSamplesPerSec = rate;
+    desc.nAvgBytesPerSec = FMT_SIZEOF (format) * chan * rate;
+    desc.nBlockAlign = FMT_SIZEOF (format) * chan;
+    desc.wBitsPerSample = 8 * FMT_SIZEOF (format);
+    desc.cbSize = 0;
+
+    MMRESULT res = waveOutOpen (& device, WAVE_MAPPER, & desc,
+     (DWORD_PTR) callback, 0, CALLBACK_FUNCTION);
+
+    if (res != MMSYSERR_NOERROR)
+    {
+        error = String (str_printf ("Error opening device (%d)!", (int) res));
+        return false;
+    }
+
+    int block_ms = aud_get_int (nullptr, "output_buffer_size") / NUM_BLOCKS;
+    block_size = FMT_SIZEOF (format) * chan * aud::rescale (block_ms, 1000, rate);
+
+    headers.insert (0, NUM_BLOCKS);
+    blocks.insert (0, NUM_BLOCKS);
+
+    next_block = 0;
+    blocks_free = NUM_BLOCKS;
+
+    waveOutPause (device);
+    prebuffer_flag = true;
+    paused_flag = false;
+    total_frames = 0;
+
+    return true;
+}
+
+void WaveOut::close_audio ()
+{
+    AUDDBG ("Closing audio.\n");
+    flush ();
+    waveOutClose (device);
+
+    headers.clear ();
+    blocks.clear ();
+}
+
+void WaveOut::period_wait ()
+{
+    pthread_mutex_lock (& buffer_mutex);
+
+    while (! blocks_free)
+        pthread_cond_wait (& buffer_cond, & buffer_mutex);
+
+    pthread_mutex_unlock (& buffer_mutex);
+}
+
+// assumes state_mutex + buffer_mutex locked
+static void write_next_block ()
+{
+    WAVEHDR & header = headers[next_block];
+    Index<char> & block = blocks[next_block];
+
+    header.lpData = block.begin ();
+    header.dwBufferLength = block.len ();
+
+    waveOutPrepareHeader (device, & header, sizeof header);
+    waveOutWrite (device, & header, sizeof header);
+
+    next_block = (next_block + 1) % NUM_BLOCKS;
+    blocks_free --;
+}
+
+// assumes state_mutex locked
+static void check_started ()
+{
+    if (prebuffer_flag)
+    {
+        AUDDBG ("Prebuffering complete.\n");
+        if (! paused_flag)
+            waveOutRestart (device);
+
+        prebuffer_flag = false;
+    }
+}
+
+int WaveOut::write_audio (const void * data, int len)
+{
+    int written = 0;
+    pthread_mutex_lock (& state_mutex);
+    pthread_mutex_lock (& buffer_mutex);
+
+    while (len > 0 && blocks_free > 0)
+    {
+        Index<char> & block = blocks[next_block];
+        int copy = aud::min (len, block_size - block.len ());
+        block.insert ((const char *) data, -1, copy);
+
+        if (block.len () == block_size)
+            write_next_block ();
+
+        written += copy;
+        data = (const char *) data + copy;
+        len -= copy;
+    }
+
+    bool filled = ! blocks_free;
+    pthread_mutex_unlock (& buffer_mutex);
+
+    if (filled)
+        check_started ();
+
+    total_frames += written / (FMT_SIZEOF (waveout_format) * waveout_chan);
+
+    pthread_mutex_unlock (& state_mutex);
+    return written;
+}
+
+void WaveOut::drain ()
+{
+    AUDDBG ("Draining.\n");
+    pthread_mutex_lock (& state_mutex);
+    pthread_mutex_lock (& buffer_mutex);
+
+    // write last partial block, if any
+    if (blocks_free > 0 && blocks[next_block].len () > 0)
+        write_next_block ();
+
+    pthread_mutex_unlock (& buffer_mutex);
+
+    check_started ();
+
+    pthread_mutex_unlock (& state_mutex);
+    pthread_mutex_lock (& buffer_mutex);
+
+    while (blocks_free < NUM_BLOCKS)
+        pthread_cond_wait (& buffer_cond, & buffer_mutex);
+
+    pthread_mutex_unlock (& buffer_mutex);
+}
+
+int WaveOut::get_delay ()
+{
+    int delay = 0;
+    pthread_mutex_lock (& state_mutex);
+
+    MMTIME t;
+    t.wType = TIME_SAMPLES;
+
+    if (waveOutGetPosition (device, & t, sizeof t) == MMSYSERR_NOERROR && t.wType == TIME_SAMPLES)
+    {
+        // frame_diff is intentionally truncated to a signed 32-bit word to
+        // account for overflow in the DWORD frame counter returned by Windows
+        int32_t frame_diff = total_frames - t.u.sample;
+        delay = aud::rescale ((int) frame_diff, waveout_rate, 1000);
+    }
+
+    pthread_mutex_unlock (& state_mutex);
+    return delay;
+}
+
+void WaveOut::pause (bool pause)
+{
+    AUDDBG (pause ? "Pausing.\n" : "Unpausing.\n");
+    pthread_mutex_lock (& state_mutex);
+
+    if (! prebuffer_flag)
+    {
+        if (pause)
+            waveOutPause (device);
+        else
+            waveOutRestart (device);
+    }
+
+    paused_flag = pause;
+
+    pthread_mutex_unlock (& state_mutex);
+}
+
+void WaveOut::flush ()
+{
+    AUDDBG ("Flushing buffers.\n");
+    pthread_mutex_lock (& state_mutex);
+
+    waveOutReset (device);
+
+    pthread_mutex_lock (& buffer_mutex);
+
+    for (auto & header : headers)
+        waveOutUnprepareHeader (device, & header, sizeof header);
+    for (auto & block : blocks)
+        block.resize (0);
+
+    next_block = 0;
+    blocks_free = NUM_BLOCKS;
+
+    pthread_cond_broadcast (& buffer_cond);
+    pthread_mutex_unlock (& buffer_mutex);
+
+    waveOutPause (device);
+    prebuffer_flag = true;
+    total_frames = 0;
+
+    pthread_mutex_unlock (& state_mutex);
+}
diff --git a/src/wavpack/wavpack.cc b/src/wavpack/wavpack.cc
index 10224a8..05768a2 100644
--- a/src/wavpack/wavpack.cc
+++ b/src/wavpack/wavpack.cc
@@ -26,15 +26,13 @@ public:
         about
     };
 
-    static constexpr auto iinfo = InputInfo (FlagWritesTag)
-        .with_exts (exts);
-
-    constexpr WavpackPlugin() : InputPlugin (info, iinfo) {}
+    constexpr WavpackPlugin() : InputPlugin (info, InputInfo (FlagWritesTag)
+        .with_exts (exts)) {}
 
     bool is_our_file (const char * filename, VFSFile & file)
         { return false; }
 
-    Tuple read_tuple (const char * filename, VFSFile & file);
+    bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
     bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
     bool play (const char * filename, VFSFile & file);
 };
@@ -218,21 +216,17 @@ wv_get_quality(WavpackContext *ctx)
      (mode & MODE_DNS) ? " (dynamic noise shaped)" : ""});
 }
 
-Tuple WavpackPlugin::read_tuple (const char * filename, VFSFile & file)
+bool WavpackPlugin::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
-    WavpackContext *ctx;
-    Tuple tuple;
     char error[1024];
 
-    ctx = WavpackOpenFileInputEx(&wv_readers, &file, nullptr, error, OPEN_TAGS, 0);
-
-    if (ctx == nullptr)
-        return tuple;
+    auto ctx = WavpackOpenFileInputEx(&wv_readers, &file, nullptr, error, OPEN_TAGS, 0);
+    if (! ctx)
+        return false;
 
     AUDDBG("starting probe of %s\n", file.filename ());
 
-    tuple.set_filename (filename);
-
     tuple.set_int (Tuple::Length,
         ((uint64_t) WavpackGetNumSamples(ctx) * 1000) / (uint64_t) WavpackGetSampleRate(ctx));
     tuple.set_str (Tuple::Codec, "WavPack");
@@ -242,15 +236,15 @@ Tuple WavpackPlugin::read_tuple (const char * filename, VFSFile & file)
     WavpackCloseFile(ctx);
 
     if (! file.fseek (0, VFS_SEEK_SET))
-        audtag::read_tag (file, & tuple, nullptr);
+        audtag::read_tag (file, tuple, nullptr);
 
     AUDDBG("returning tuple for file %s\n", file.filename ());
-    return tuple;
+    return true;
 }
 
 bool WavpackPlugin::write_tuple (const char * filename, VFSFile & handle, const Tuple & tuple)
 {
-    return audtag::tuple_write(tuple, handle, audtag::TagType::APE);
+    return audtag::write_tuple (handle, tuple, audtag::TagType::APE);
 }
 
 const char WavpackPlugin::about[] =
diff --git a/src/xsf/desmume/NDSSystem.cc b/src/xsf/desmume/NDSSystem.cc
index ee02bc9..e55d14c 100644
--- a/src/xsf/desmume/NDSSystem.cc
+++ b/src/xsf/desmume/NDSSystem.cc
@@ -184,8 +184,8 @@ void NDS_DeInit(void) {
      if(MMU.CART_ROM != MMU.UNUSED_RAM)
         NDS_FreeROM();
 
-	armcpu_deinit(&NDS_ARM7);
-	armcpu_deinit(&NDS_ARM9);
+     armcpu_deinit(&NDS_ARM7);
+     armcpu_deinit(&NDS_ARM9);
 
      nds.nextHBlank = 3168;
      SPU_DeInit();
diff --git a/src/xsf/plugin.cc b/src/xsf/plugin.cc
index ae116b8..54b4da7 100644
--- a/src/xsf/plugin.cc
+++ b/src/xsf/plugin.cc
@@ -53,15 +53,13 @@ public:
 		& prefs
 	};
 
-	static constexpr auto iinfo = InputInfo()
-		.with_exts(exts);
-
-	constexpr XSFPlugin() : InputPlugin(info, iinfo) {}
+	constexpr XSFPlugin() : InputPlugin(info, InputInfo()
+		.with_exts(exts)) {}
 
 	bool init();
 
 	bool is_our_file(const char *filename, VFSFile &file);
-	Tuple read_tuple(const char *filename, VFSFile &file);
+	bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 	bool play(const char *filename, VFSFile &file);
 };
 
@@ -90,32 +88,27 @@ Index<char> xsf_get_lib(char *filename)
 	return file ? file.read_all() : Index<char>();
 }
 
-Tuple XSFPlugin::read_tuple(const char *filename, VFSFile &fd)
+bool XSFPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-	Tuple t;
-	corlett_t *c;
-
-	Index<char> buf = fd.read_all ();
-
+	Index<char> buf = file.read_all ();
 	if (!buf.len())
-		return t;
+		return false;
 
+	corlett_t *c;
 	if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
-		return t;
-
-	t.set_filename (filename);
+		return false;
 
-	t.set_int (Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
-	t.set_str (Tuple::Artist, c->inf_artist);
-	t.set_str (Tuple::Album, c->inf_game);
-	t.set_str (Tuple::Title, c->inf_title);
-	t.set_str (Tuple::Copyright, c->inf_copy);
-	t.set_str (Tuple::Quality, _("sequenced"));
-	t.set_str (Tuple::Codec, "GBA/Nintendo DS Audio");
+	tuple.set_int(Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
+	tuple.set_str(Tuple::Artist, c->inf_artist);
+	tuple.set_str(Tuple::Album, c->inf_game);
+	tuple.set_str(Tuple::Title, c->inf_title);
+	tuple.set_str(Tuple::Copyright, c->inf_copy);
+	tuple.set_str(Tuple::Quality, _("sequenced"));
+	tuple.set_str(Tuple::Codec, "GBA/Nintendo DS Audio");
 
 	free(c);
 
-	return t;
+	return true;
 }
 
 static int xsf_get_length(const Index<char> &buf)
@@ -204,7 +197,7 @@ bool XSFPlugin::play(const char *filename, VFSFile &file)
 		xsf_gen(samples, seglen);
 		pos += 16.666;
 
-        write_audio(samples, seglen * 4);
+		write_audio(samples, seglen * 4);
 
 		bool ignore_length = aud_get_bool(CFG_ID, "ignore_length");
 		if (pos >= length && !ignore_length)
diff --git a/src/xspf/xspf.cc b/src/xspf/xspf.cc
index 5072774..dc89c9a 100644
--- a/src/xspf/xspf.cc
+++ b/src/xspf/xspf.cc
@@ -41,44 +41,45 @@
 typedef struct {
     Tuple::Field tupleField;
     const char *xspfName;
-    Tuple::ValueType type;
     bool isMeta;
 } xspf_entry_t;
 
 
 static const xspf_entry_t xspf_entries[] = {
-    {Tuple::Artist, "creator", Tuple::String, false},
-    {Tuple::Title, "title", Tuple::String, false},
-    {Tuple::Album, "album", Tuple::String, false},
-    {Tuple::Comment, "annotation", Tuple::String, false},
-    {Tuple::Genre, "genre", Tuple::String, true},
-
-    {Tuple::Track, "trackNum", Tuple::Int, false},
-    {Tuple::Length, "duration", Tuple::Int, false},
-    {Tuple::Year, "year", Tuple::Int, true},
-    {Tuple::Quality, "quality", Tuple::String, true},
-
-    {Tuple::Codec, "codec", Tuple::String, true},
-
-    {Tuple::AlbumArtist, "album-artist", Tuple::String, true},
-    {Tuple::Composer, "composer", Tuple::String, true},
-    {Tuple::Performer, "performer", Tuple::String, true},
-    {Tuple::Copyright, "copyright", Tuple::String, true},
-    {Tuple::Date, "date", Tuple::String, true},
-
-    {Tuple::Subtune, "subsong-id", Tuple::Int, true},
-    {Tuple::NumSubtunes, "subsong-num", Tuple::Int, true},
-    {Tuple::MIMEType, "mime-type", Tuple::String, true},
-    {Tuple::Bitrate, "bitrate", Tuple::Int, true},
-    {Tuple::StartTime, "seg-start", Tuple::Int, true},
-    {Tuple::EndTime, "seg-end", Tuple::Int, true},
-
-    {Tuple::AlbumGain, "gain-album-gain", Tuple::Int, true},
-    {Tuple::AlbumPeak, "gain-album-peak", Tuple::Int, true},
-    {Tuple::TrackGain, "gain-track-gain", Tuple::Int, true},
-    {Tuple::TrackPeak, "gain-track-peak", Tuple::Int, true},
-    {Tuple::GainDivisor, "gain-gain-unit", Tuple::Int, true},
-    {Tuple::PeakDivisor, "gain-peak-unit", Tuple::Int, true},
+    {Tuple::Title, "title", false},
+    {Tuple::Artist, "creator", false},
+    {Tuple::Album, "album", false},
+    {Tuple::AlbumArtist, "album-artist", true},
+    {Tuple::Comment, "annotation", false},
+    {Tuple::Genre, "genre", true},
+    {Tuple::Year, "year", true},
+
+    {Tuple::Composer, "composer", true},
+    {Tuple::Performer, "performer", true},
+    {Tuple::Copyright, "copyright", true},
+    {Tuple::Date, "date", true},
+
+    {Tuple::Track, "trackNum", false},
+    {Tuple::Length, "duration", false},
+
+    {Tuple::Bitrate, "bitrate", true},
+    {Tuple::Codec, "codec", true},
+    {Tuple::Quality, "quality", true},
+
+    {Tuple::AudioFile, "audio-file", true},
+
+    {Tuple::Subtune, "subsong-id", true},
+    {Tuple::NumSubtunes, "subsong-num", true},
+
+    {Tuple::StartTime, "seg-start", true},
+    {Tuple::EndTime, "seg-end", true},
+
+    {Tuple::AlbumGain, "gain-album-gain", true},
+    {Tuple::AlbumPeak, "gain-album-peak", true},
+    {Tuple::TrackGain, "gain-track-gain", true},
+    {Tuple::TrackPeak, "gain-track-peak", true},
+    {Tuple::GainDivisor, "gain-gain-unit", true},
+    {Tuple::PeakDivisor, "gain-peak-unit", true},
 };
 
 static const char * const xspf_exts[] = {"xspf"};
@@ -148,13 +149,15 @@ static void xspf_add_file (xmlNode * track, const char * filename,
                 if ((entry.isMeta == isMeta) &&
                     !xmlStrcmp(findName, (xmlChar *)entry.xspfName)) {
                     xmlChar *str = xmlNodeGetContent(nptr);
-                    switch (entry.type) {
+                    switch (Tuple::field_get_type (entry.tupleField)) {
                         case Tuple::String:
                             tuple.set_str (entry.tupleField, (char *)str);
+                            tuple.set_state (Tuple::Valid);
                             break;
 
                         case Tuple::Int:
                             tuple.set_int (entry.tupleField, atol((char *)str));
+                            tuple.set_state (Tuple::Valid);
                             break;
 
                         default:
@@ -171,7 +174,7 @@ static void xspf_add_file (xmlNode * track, const char * filename,
 
     if (location != nullptr)
     {
-        if (tuple)
+        if (tuple.valid ())
             tuple.set_filename (location);
 
         items.append (location, std::move (tuple));
@@ -313,11 +316,10 @@ static bool is_valid_string (const char * s, char * * subst)
 }
 
 
-static void xspf_add_node(xmlNodePtr node, Tuple::ValueType type,
-        bool isMeta, const char *xspfName, const char *strVal,
-        const int intVal)
+static void xspf_add_node (xmlNodePtr node, bool isMeta, const char * xspfName, const char * strVal)
 {
     xmlNodePtr tmp;
+    char * subst;
 
     if (isMeta) {
         tmp = xmlNewNode(nullptr, (xmlChar *) "meta");
@@ -325,24 +327,12 @@ static void xspf_add_node(xmlNodePtr node, Tuple::ValueType type,
     } else
         tmp = xmlNewNode(nullptr, (xmlChar *) xspfName);
 
-    switch (type) {
-        case Tuple::String:
-            char * subst;
-            if (is_valid_string (strVal, & subst))
-                xmlAddChild (tmp, xmlNewText ((xmlChar *) strVal));
-            else
-            {
-                xmlAddChild (tmp, xmlNewText ((xmlChar *) subst));
-                g_free (subst);
-            }
-            break;
-
-        case Tuple::Int:
-            xmlAddChild (tmp, xmlNewText ((xmlChar *) (char *) int_to_str (intVal)));
-            break;
-
-        default:
-            break;
+    if (is_valid_string (strVal, & subst))
+        xmlAddChild (tmp, xmlNewText ((xmlChar *) strVal));
+    else
+    {
+        xmlAddChild (tmp, xmlNewText ((xmlChar *) subst));
+        g_free (subst);
     }
 
     xmlAddChild(node, tmp);
@@ -367,7 +357,7 @@ bool XSPFLoader::save (const char * filename, VFSFile & file,
     xmlDocSetRootElement(doc, rootnode);
 
     if (title)
-        xspf_add_node (rootnode, Tuple::String, false, "title", title, 0);
+        xspf_add_node (rootnode, false, "title", title);
 
     tracklist = xmlNewNode(nullptr, (xmlChar *)"trackList");
     xmlAddChild(rootnode, tracklist);
@@ -377,8 +367,6 @@ bool XSPFLoader::save (const char * filename, VFSFile & file,
         const char * filename = item.filename;
         const Tuple & tuple = item.tuple;
         xmlNodePtr track, location;
-        String scratch;
-        int scratchi = 0;
 
         track = xmlNewNode(nullptr, (xmlChar *)"track");
         location = xmlNewNode(nullptr, (xmlChar *)"location");
@@ -387,28 +375,20 @@ bool XSPFLoader::save (const char * filename, VFSFile & file,
         xmlAddChild(track, location);
         xmlAddChild(tracklist, track);
 
-        if (tuple)
+        for (auto & entry : xspf_entries)
         {
-            for (const xspf_entry_t & entry : xspf_entries)
+            switch (tuple.get_value_type (entry.tupleField))
             {
-                bool isOK = (tuple.get_value_type (entry.tupleField) == entry.type);
-
-                switch (entry.type) {
-                    case Tuple::String:
-                        scratch = tuple.get_str (entry.tupleField);
-                        if (! scratch)
-                            isOK = false;
-                        break;
-                    case Tuple::Int:
-                        scratchi = tuple.get_int (entry.tupleField);
-                        break;
-                    default:
-                        break;
-                }
-
-                if (isOK)
-                    xspf_add_node (track, entry.type, entry.isMeta,
-                     entry.xspfName, scratch, scratchi);
+            case Tuple::String:
+                xspf_add_node (track, entry.isMeta, entry.xspfName,
+                 tuple.get_str (entry.tupleField));
+                break;
+            case Tuple::Int:
+                xspf_add_node (track, entry.isMeta, entry.xspfName,
+                 int_to_str (tuple.get_int (entry.tupleField)));
+                break;
+            default:
+                break;
             }
         }
     }