changeset 2148:5b5c450a6a37

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author Jonathan Schleifer <js@h3c.de>
date Thu, 01 Nov 2007 15:38:07 +0100
parents e49d9b0ee308 (current diff) db2123da62ac (diff)
children cf20f1bd2f1e
files buildsys.mk.in src/audiocompress/config.h src/jack/xconvert.h src/paranormal-ng/.depend src/paranormal-ng/libcalc/.depend src/paranormal-ng/presets/.depend src/paranormal-ng/presets/.depend-done
diffstat 126 files changed, 20832 insertions(+), 12937 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 01 15:37:43 2007 +0100
+++ b/.hgtags	Thu Nov 01 15:38:07 2007 +0100
@@ -2,3 +2,5 @@
 76c778a3a5fe18c8ea5ddb0c361270a38452edc7 audacious-plugins-1.4.0-dr1
 5f892afeb8e1ff5e60f32449359a59eda383f14a audacious-plugins-1.4.0-dr2
 49704b7f41db4070965a16fd6856a7e4760dbc1c audacious-plugins-1.4.0-dr3
+14adeaf9c20f3e940cf0117ba6aa4738cf7ce869 audacious-plugins-1.4.0-beta2
+42a16b5e51517c5722ea4881540b8766a2c91dd8 audacious-plugins-1.4.0-beta3
--- a/buildsys.mk.in	Thu Nov 01 15:37:43 2007 +0100
+++ b/buildsys.mk.in	Thu Nov 01 15:38:07 2007 +0100
@@ -104,7 +104,7 @@
 			esac; \
 		done; \
 		if test x"$$list" != "x"; then \
-			if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
+			if ${CC} ${CPPFLAGS} -M $$list >.deps; then \
 				${DEPEND_OK}; \
 			else \
 				${DEPEND_FAILED}; \
--- a/configure.ac	Thu Nov 01 15:37:43 2007 +0100
+++ b/configure.ac	Thu Nov 01 15:38:07 2007 +0100
@@ -213,7 +213,7 @@
 		PICFLAGS="-fPIC -DPIC"
 		PICLDFLAGS="-fPIC -DPIC -shared"
 		LIBLDFLAGS="-fPIC -DPIC -shared"
-		AUDLDFLAGS="-Wl,-export-dynamic -Wl,-rpath=\${libdir},-rpath=\${plugindir}"
+		AUDLDFLAGS="-L \${pluginlibdir} -Wl,-export-dynamic -Wl,-rpath=\${pluginlibdir}"
 		SHARED_SUFFIX=".so"
 		;;
 esac
@@ -367,19 +367,21 @@
 )
 
 if test "$enable_mp3" = "yes"; then
-        AC_CHECK_LIB(mad, mad_timer_add,
-		[INPUT_PLUGINS="$INPUT_PLUGINS madplug"],
-		[enable_mp3="no"])
+    AM_PATH_LIBMAD([enable_mp3=yes], 
+        [AC_MSG_WARN([*** Cannot find libmad, mp3 plugin will not be built ***])
+         enable_mp3=no]
+    )
+else
+    AC_MSG_RESULT([*** mp3 plugin disabled per user request ***])
+    enable_mp3=no
 fi
-# XXX rtsp support
-#        PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0],
-#            [LIBNMS_SRC=rtsp.c
-#             AC_DEFINE(HAVE_NEMESI,,[Define if rtp/rtsp support is available])
-#            ],[LIBNMS_SRC=""])
-#        AC_SUBST(LIBNMS_CFLAGS)
-#        AC_SUBST(LIBNMS_LIBS)
-#        AC_SUBST(LIBNMS_SRC)
-# fi
+
+if test "$enable_mp3" = "yes"; then
+	INPUT_PLUGINS="$INPUT_PLUGINS madplug"
+fi
+
+AC_SUBST(MAD_CFLAGS)
+AC_SUBST(MAD_LIBS)
 
 dnl *** Rocklight
 
@@ -621,7 +623,7 @@
 )
 
 if test "$enable_vorbis" = "yes"; then
-    PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
+    PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.2 vorbisfile >= 1.2],
         [have_oggvorbis=yes],
         [AC_MSG_WARN([*** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***])
          have_oggvorbis=no]
@@ -1463,7 +1465,7 @@
 if test "$enable_filewriter_mp3" = "yes"; then
    AC_CHECK_LIB(mp3lame -lm, lame_init, [have_lame=yes], [have_lame=no])
    if test "$have_lame" = yes; then
-      AC_DEFINE(FILEWRITER_MP3, 1, [Define if Vorbis output part should be built])
+      AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
 	  FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
    fi
 fi
@@ -1479,6 +1481,7 @@
    [have_vorbisenc=yes], [have_vorbisenc=no])
    if test "$have_vorbisenc" = yes; then
       AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
+      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags vorbisenc`"
       FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs vorbisenc`"
    fi
 fi
@@ -1495,6 +1498,7 @@
    )
    if test "$have_writer_flac" = yes; then
       AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
+	  FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags flac`"
 	  FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs flac`"
    fi
 fi
@@ -1505,6 +1509,7 @@
    have_writer_flac=no
    FILEWRITER_LIBS=""
 fi
+AC_SUBST(FILEWRITER_CFLAGS)
 AC_SUBST(FILEWRITER_LIBS)
 
 dnl *** End of all plugin checks ***
--- a/extra.mk.in	Thu Nov 01 15:37:43 2007 +0100
+++ b/extra.mk.in	Thu Nov 01 15:38:07 2007 +0100
@@ -365,6 +365,7 @@
 IMLIB2_CFLAGS ?= @IMLIB2_CFLAGS@
 IMLIB2_LIBS ?= @IMLIB2_LIBS@
 SIMD_CFLAGS ?= @SIMD_CFLAGS@
+FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
 FILEWRITER_LIBS ?= @FILEWRITER_LIBS@
 GCC42_CFLAGS ?= @GCC42_CFLAGS@
 CDIO_LIBS ?= @CDIO_LIBS@
@@ -377,4 +378,5 @@
 LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
 MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
 MOWGLI_LIBS ?= @MOWGLI_LIBS@
-plugindir = @plugindir@
+pluginlibdir = @plugindir@
+plugindir = ${pluginlibdir}
--- a/m4/libFLAC.m4	Thu Nov 01 15:37:43 2007 +0100
+++ b/m4/libFLAC.m4	Thu Nov 01 15:38:07 2007 +0100
@@ -28,7 +28,7 @@
     LIBFLAC_CFLAGS="-I$libFLAC_includes"
   elif test "x$libFLAC_prefix" != "x" ; then
     LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
-  elif test "$prefix" != "xNONE"; then
+  elif test "x$prefix" != "xNONE"; then
     LIBFLAC_CFLAGS="-I$prefix/include"
   fi
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/m4/libmad.m4	Thu Nov 01 15:38:07 2007 +0100
@@ -0,0 +1,104 @@
+dnl Configure paths for libmad
+dnl derived from libFLAC.m4
+
+dnl AM_PATH_LIBMAD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libmad, and define MAD_CFLAGS and MAD_LIBS
+dnl
+AC_DEFUN([AM_PATH_LIBMAD],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(libmad,[  --with-libmad=PFX   Prefix where libmad is installed (optional)], libmad_prefix="$withval", libmad_prefix="")
+AC_ARG_WITH(libmad-libraries,[  --with-libmad-libraries=DIR   Directory where libmad library is installed (optional)], libmad_libraries="$withval", libmad_libraries="")
+AC_ARG_WITH(libmad-includes,[  --with-libmad-includes=DIR   Directory where libmad header files are installed (optional)], libmad_includes="$withval", libmad_includes="")
+AC_ARG_ENABLE(libmadtest, [  --disable-libmadtest   do not try to compile and run a test libmad program],, enable_libmadtest=yes)
+
+  if test "x$libmad_libraries" != "x" ; then
+    MAD_LIBS="-L$libmad_libraries"
+  elif test "x$libmad_prefix" != "x" ; then
+    MAD_LIBS="-L$libmad_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    MAD_LIBS="-L$libdir"
+  fi
+
+  MAD_LIBS="$MAD_LIBS -lmad -lm"
+
+  if test "x$libmad_includes" != "x" ; then
+    MAD_CFLAGS="-I$libmad_includes"
+  elif test "x$libmad_prefix" != "x" ; then
+    MAD_CFLAGS="-I$libmad_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    MAD_CFLAGS="-I$prefix/include"
+  fi
+
+  no_libmad=""
+
+
+  if test "x$enable_libmadtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $MAD_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $MAD_CFLAGS"
+    LIBS="$LIBS $MAD_LIBS"
+dnl
+dnl Now check if the installed libmad is sufficiently new.
+dnl
+      rm -f conf.libmadtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mad.h>
+
+int main ()
+{
+  mad_timer_t t;
+  mad_timer_add(&t, t);
+  system("touch conf.libmadtest");
+  return 0;
+}
+
+],, no_libmad=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_libmad" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.libmadtest ; then
+       :
+     else
+       echo "*** Could not run libmad test program, checking why..."
+       CFLAGS="$CFLAGS $MAD_CFLAGS"
+       LIBS="$LIBS $MAD_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding libmad or finding the wrong"
+       echo "*** version of libmad. If it is not finding libmad, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means libmad was incorrectly installed"
+       echo "*** or that you have moved libmad since it was installed. In the latter case, you"
+       echo "*** may want to edit the libmad-config script: $LIBMAD_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     MAD_CFLAGS=""
+     MAD_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(MAD_CFLAGS)
+  AC_SUBST(MAD_LIBS)
+  rm -f conf.libmadtest
+])
--- a/po/LINGUAS	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/LINGUAS	Thu Nov 01 15:38:07 2007 +0100
@@ -3,6 +3,7 @@
 cs
 cy
 de
+fr
 ja
 ro
 ru
--- a/po/POTFILES.in	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/POTFILES.in	Thu Nov 01 15:38:07 2007 +0100
@@ -1,4 +1,5 @@
-src/aac/src/libmp4.c
+# Please don't update this file manually - use ./update-potfiles.sh instead!
+src/aac/libmp4.c
 src/adplug/adplug-xmms.cc
 src/alac/plugin.c
 src/alarm/interface.c
@@ -66,6 +67,8 @@
 src/filewriter/mp3.c
 src/filewriter/vorbis.c
 src/flacng/plugin.c
+src/gnomeshortcuts/gnomeshortcuts.c
+src/hotkey/plugin.c
 src/jack/bio2jack.c
 src/jack/configure.c
 src/jack/jack.c
@@ -79,6 +82,7 @@
 src/metronom/metronom.c
 src/modplug/gui/interface.cxx
 src/modplug/gui/main.cxx
+src/modplug/gui/modplug.glade
 src/modplug/gui/support.cxx
 src/musepack/libmpc.cxx
 src/null/null.c
@@ -86,9 +90,9 @@
 src/OSS4/configure.c
 src/OSS/about.c
 src/OSS/configure.c
+src/paranormal-ng/plugin.c
 src/paranormal/plugin.c
 src/pulse_audio/pulse_audio.c
-src/rovascope/plugin.c
 src/scrobbler/configure.c
 src/scrobbler/gerpok.c
 src/scrobbler/gtkstuff.c
@@ -96,12 +100,15 @@
 src/scrobbler/scrobbler.c
 src/sid/xmms-sid.c
 src/sid/xmms-sid.glade
+src/sid/xs_about.c
+src/sid/xs_config.c
 src/sid/xs_fileinfo.c
 src/sid/xs_glade.c
 src/sid/xs_interface.c
 src/sid/xs_length.c
 src/sid/xs_sidplay1.cc
 src/sid/xs_sidplay2.cc
+src/sid/xs_slsup.c
 src/sid/xs_stil.c
 src/sndstretch/sndstretch_xmms.c
 src/song_change/song_change.c
@@ -111,8 +118,8 @@
 src/stereo_plugin/stereo.c
 src/sun/about.c
 src/sun/configure.c
-src/timidity/src/interface.c
-src/timidity/src/xmms-timidity.c
+src/timidity/interface.c
+src/timidity/xmms-timidity.c
 src/tonegen/tonegen.c
 src/tta/libtta.c
 src/vorbis/configure.c
--- a/po/audacious-plugins.pot	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/audacious-plugins.pot	Thu Nov 01 15:38:07 2007 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+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"
@@ -16,50 +16,50 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 msgid "About MP4 AAC player plugin"
 msgstr ""
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -72,206 +72,209 @@
 "Linked AdPlug library version: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 msgid "AdPlug :: Configuration"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 msgid "Sound quality"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr ""
 
+#: src/adplug/adplug-xmms.cc:308
+msgid "8bit"
+msgstr ""
+
 #: src/adplug/adplug-xmms.cc:313
-msgid "8bit"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:318
 msgid "16bit"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 msgid "Formats"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Format"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 msgid "Title: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 msgid "File Type: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
+#: src/adplug/adplug-xmms.cc:561
+msgid "Instruments: "
+msgstr ""
+
 #: src/adplug/adplug-xmms.cc:566
-msgid "Instruments: "
+msgid "Orders: "
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:567
+msgid "Patterns: "
 msgstr ""
 
 #: src/adplug/adplug-xmms.cc:571
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:572
-msgid "Patterns: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:576
 msgid "Song"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 msgid "Instrument name"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 msgid "Song message"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr ""
 
+#: src/adplug/adplug-xmms.cc:725
+msgid "Order: "
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:726
+msgid "Pattern: "
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:728
+msgid "Row: "
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:729
+msgid "Speed: "
+msgstr ""
+
 #: src/adplug/adplug-xmms.cc:730
-msgid "Order: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:731
-msgid "Pattern: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:733
-msgid "Row: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:734
-msgid "Speed: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:735
 msgid "Timer: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr ""
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 msgid "About Apple Lossless Audio Plugin"
 msgstr ""
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -283,42 +286,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr ""
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr ""
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -331,155 +336,155 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 msgid "Alarm Settings"
 msgstr ""
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 msgid "Time"
 msgstr ""
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 msgid "hours"
 msgstr ""
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 msgid "Quiet after:"
 msgstr ""
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr ""
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 msgid "Sunday"
 msgstr ""
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 msgid "Monday"
 msgstr ""
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 msgid "seconds"
 msgstr ""
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 msgid "Volume"
 msgstr ""
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 msgid "%"
 msgstr ""
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 msgid "Final"
 msgstr ""
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 msgid "enable"
 msgstr ""
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr ""
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 msgid "Reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 msgid "Use reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 msgid "Options"
 msgstr ""
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -534,15 +539,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 msgid "Thankyou"
 msgstr ""
 
@@ -571,57 +576,53 @@
 "Author: Matthieu Sozeau (mattam@altern.org)"
 msgstr ""
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr ""
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr ""
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr ""
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr ""
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr ""
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr ""
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr ""
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr ""
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr ""
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr ""
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr ""
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr ""
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr ""
 
@@ -1184,8 +1185,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr ""
 
@@ -1284,50 +1285,50 @@
 msgid "Concave Rectangle"
 msgstr ""
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:78
-msgid "Title Change"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:80
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 msgid "Volume Change"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:90
-msgid "Pause On"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:91
+msgid "Pause On"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:95
-msgid "Pause Off"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:96
+msgid "Pause Off"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
@@ -1405,126 +1406,127 @@
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1552,25 +1554,25 @@
 msgstr ""
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr ""
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr ""
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1580,116 +1582,120 @@
 "keeping the volume level more or less consistent"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 msgid "AudioCompress preferences"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 msgid "Maximum gain:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 msgid "Audio values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr ""
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr ""
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr ""
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr ""
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr ""
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr ""
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+msgid "About CD Audio Plugin NG"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1702,114 +1708,111 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-msgid "About CD Audio Plugin NG"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 msgid "CD Audio Plugin Configuration"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 msgid "Title information"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 msgid "Server: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 msgid "Port: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr ""
 
+#: src/console/Audacious_Config.cxx:236
+msgid "SPC"
+msgstr ""
+
 #: src/console/Audacious_Config.cxx:237
-msgid "SPC"
+msgid "Ignore length from SPC tags"
 msgstr ""
 
 #: src/console/Audacious_Config.cxx:238
-msgid "Ignore length from SPC tags"
-msgstr ""
-
-#: src/console/Audacious_Config.cxx:239
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr ""
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -1817,7 +1820,7 @@
 "        Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -1825,27 +1828,27 @@
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr ""
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr ""
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr ""
 
@@ -1897,7 +1900,7 @@
 msgid "Server"
 msgstr ""
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr ""
@@ -2074,8 +2077,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr ""
 
@@ -2193,11 +2195,11 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2217,63 +2219,57 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:199
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 msgid "File Writer Configuration"
 msgstr ""
 
+#: src/filewriter/filewriter.c:488
+msgid "Output file format:"
+msgstr ""
+
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
+msgid "Configure"
+msgstr ""
+
+#: src/filewriter/filewriter.c:521
+msgid "Save into original directory"
+msgstr ""
+
 #: src/filewriter/filewriter.c:526
-msgid "Output file format:"
-msgstr ""
-
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
-msgid "Configure"
-msgstr ""
-
-#: src/filewriter/filewriter.c:559
-msgid "Save into original directory"
-msgstr ""
-
-#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2345,8 +2341,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2447,19 +2443,19 @@
 msgid "Tags"
 msgstr ""
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 msgid "Vorbis Encoder Configuration"
 msgstr ""
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 msgid "FLAC Audio Plugin "
 msgstr ""
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2469,31 +2465,148 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 msgid "About FLAC Audio Plugin"
 msgstr ""
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+msgid "About Gnome Shortcut Plugin"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+msgid "(none)"
+msgstr ""
+
+#: src/hotkey/plugin.c:752
+msgid "Global Hotkey Plugin Configuration"
+msgstr ""
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+msgid "<b>Playback:</b>"
+msgstr ""
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+msgid "Play/Pause:"
+msgstr ""
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr ""
+
+#: src/hotkey/plugin.c:804
+msgid "Stop:"
+msgstr ""
+
+#: src/hotkey/plugin.c:807
+msgid "Next Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+msgid "<b>Volume Control:</b>"
+msgstr ""
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+msgid "Mute:"
+msgstr ""
+
+#: src/hotkey/plugin.c:844
+msgid "Volume Up:"
+msgstr ""
+
+#: src/hotkey/plugin.c:847
+msgid "Volume Down:"
+msgstr ""
+
+#: src/hotkey/plugin.c:852
+msgid "<b>Player:</b>"
+msgstr ""
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+msgid "About Global Hotkey Plugin"
+msgstr ""
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 msgid "jack Plugin configuration"
 msgstr ""
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 msgid "Enable debug printing"
 msgstr ""
 
@@ -2515,15 +2628,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr ""
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2534,35 +2647,35 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 msgid "Name"
 msgstr ""
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 msgid "Remove"
 msgstr ""
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2573,15 +2686,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr ""
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr ""
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr ""
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2595,12 +2708,12 @@
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 msgstr ""
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2608,12 +2721,12 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
@@ -2666,12 +2779,12 @@
 msgid "Preamp (dB):"
 msgstr ""
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr ""
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr ""
 
@@ -2679,7 +2792,8 @@
 msgid "ID3 format:"
 msgstr ""
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr ""
 
@@ -2707,38 +2821,38 @@
 msgid " ID3 Tag "
 msgstr ""
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr ""
 
@@ -2746,7 +2860,7 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -2762,7 +2876,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr ""
@@ -2807,7 +2921,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -2825,15 +2939,15 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 msgid "About MPEG Audio Plugin"
 msgstr ""
 
-#: src/metronom/metronom.c:86
-msgid "About Metronom"
-msgstr ""
-
 #: src/metronom/metronom.c:87
+msgid "About Metronom"
+msgstr ""
+
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2842,156 +2956,160 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 msgid "ModPlug Configuration"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 msgid "44 kHz"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 msgid "22 kHz"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 msgid "11 kHz"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
+msgid "Enable"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
+msgid "Depth"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
+msgid "Delay"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
-msgid "Enable"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
-msgid "Depth"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
-msgid "Delay"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
+msgid "Amount"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
+msgid "Range"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:510
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:519
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 msgid "MOD Info"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3005,23 +3123,37 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 msgid "Samples"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 msgid "Instruments"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3031,26 +3163,21 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 msgid "About Modplug"
 msgstr ""
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
-msgid "Musepack Decoder Plugin 1.2"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:146
+msgid "Musepack Decoder Plugin 1.2"
+msgstr ""
+
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3060,135 +3187,135 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 msgid "Musepack Decoder Configuration"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 msgid "General Settings"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 msgid "Plugin"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 msgid "ReplayGain Settings"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 msgid "ReplayGain Type"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 msgid "Use Track Gain"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 msgid "Use Album Gain"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 msgid "Track:"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
-#, c-format
-msgid "Streamversion %d"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:595
 #, c-format
-msgid "Encoder: %s"
+msgid "Streamversion %d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:596
 #, c-format
-msgid "Profile: %s"
+msgid "Encoder: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
 #, c-format
-msgid "Samplerate: %d Hz"
+msgid "Average bitrate: %6.1f kbps"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:599
 #, c-format
-msgid "Channels: %d"
+msgid "Samplerate: %d Hz"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:600
 #, c-format
-msgid "Length: %d:\\%.2d"
+msgid "Channels: %d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:601
 #, c-format
-msgid "File size: %d Bytes"
+msgid "Length: %d:\\%.2d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:602
 #, c-format
-msgid "Track Peak: %5u"
+msgid "File size: %d Bytes"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:603
 #, c-format
-msgid "Track Gain: %-+2.2f dB"
+msgid "Track Peak: %5u"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:604
 #, c-format
-msgid "Album Peak: %5u"
+msgid "Track Gain: %-+2.2f dB"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:605
 #, c-format
+msgid "Album Peak: %5u"
+msgstr ""
+
+#: src/musepack/libmpc.cxx:606
+#, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr ""
 
@@ -3241,24 +3368,24 @@
 "USA."
 msgstr ""
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr ""
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr ""
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr ""
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr ""
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr ""
 
@@ -3266,7 +3393,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr ""
 
@@ -3294,15 +3421,15 @@
 "USA."
 msgstr ""
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3322,27 +3449,27 @@
 "USA."
 msgstr ""
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr ""
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr ""
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr ""
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr ""
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3350,11 +3477,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3364,7 +3491,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 msgid "Scrobbler Error"
 msgstr ""
 
@@ -3376,125 +3503,125 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 msgid "Audacious-SID configuration"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 msgid "8-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 msgid "16-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 msgid "Resolution:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 msgid "Samplerate:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 msgid "Use oversampling"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 msgid "Oversampling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3502,89 +3629,89 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 msgid "SID model:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 msgid "Memory mode:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -3593,47 +3720,47 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 msgid "Resampling (FIR)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 msgid "reSID sampling options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -3641,275 +3768,316 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 msgid "Export"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 msgid "Import"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 msgid "Delete"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 msgid "Filter curve:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 msgid "Playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 msgid "DB-file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+msgid "Override generic Tuplez format string"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+msgid "Song title format:"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 msgid "Sub-tune handling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 msgid "STIL file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 msgid "Song Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 msgid "Duration:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 msgid "Sub-tune Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 msgid "Confirm selected action"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 msgid "Yes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 msgid "No"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 msgid "General info"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4052,6 +4220,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4065,61 +4248,61 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 msgid "About SndStretch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 msgid "Speed"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 msgid "Scale"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4136,13 +4319,13 @@
 "%%p: Currently playing (1 or 0)"
 msgstr ""
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
 msgstr ""
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4199,22 +4382,22 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr ""
 
@@ -4246,43 +4429,43 @@
 msgid "Sun driver configuration"
 msgstr ""
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr ""
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr ""
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr ""
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr ""
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr ""
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
 "by Konstantin Korikov"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr ""
 
@@ -4299,816 +4482,816 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 msgid "Output plugin error\n"
 msgstr ""
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 msgid "Unknown error\n"
 msgstr ""
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 msgid "TTA input plugin "
 msgstr ""
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 msgid "About True Audio Plugin"
 msgstr ""
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 msgid "ID3 Tag:"
 msgstr ""
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr ""
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr ""
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr ""
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr ""
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr ""
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr ""
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr ""
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr ""
 
+#: src/vorbis/fileinfo.c:80
+msgid "Blues"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr ""
+
 #: src/vorbis/fileinfo.c:83
-msgid "Blues"
+msgid "Other"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
+msgid "R&B"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
+msgid "Rap"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
+msgid "Reggae"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:84
-msgid "Disco"
+msgid "Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
+msgid "Techno"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
+msgid "Industrial"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
+msgid "Ska"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
+msgid "Death Metal"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:86
-msgid "Rap"
+msgid "Euro-Techno"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
+msgid "Ambient"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:87
-msgid "Industrial"
+msgid "Jazz+Funk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:87
+msgid "Fusion"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
+msgid "Trance"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:87
+msgid "Classical"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
+msgid "Instrumental"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:88
-msgid "Pranks"
+msgid "Acid"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
+msgid "House"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
+msgid "Sound Clip"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:89
-msgid "Ambient"
+msgid "Gospel"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
+msgid "Noise"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:89
-msgid "Vocal"
+msgid "AlternRock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:90
-msgid "Jazz+Funk"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:90
-msgid "Fusion"
+msgid "Bass"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:90
-msgid "Trance"
+msgid "Soul"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:90
-msgid "Classical"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:91
-msgid "Instrumental"
+msgid "Punk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:91
-msgid "Acid"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:91
-msgid "House"
+msgid "Meditative"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
+msgid "Instrumental Pop"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
+msgid "Instrumental Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
+msgid "Ethnic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
+msgid "Gothic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
+msgid "Darkwave"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
+msgid "Techno-Industrial"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
+msgid "Electronic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
+msgid "Pop-Folk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
+msgid "Dream"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:95
+msgid "Southern Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
+msgid "Comedy"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:95
-msgid "Gothic"
+msgid "Cult"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:96
+msgid "Gangsta Rap"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
+msgid "Top 40"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:96
-msgid "Electronic"
+msgid "Christian Rap"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
+msgid "Pop/Funk"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
+msgid "Jungle"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:97
-msgid "Dream"
+msgid "Native American"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
+msgid "Cabaret"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:98
-msgid "Comedy"
+msgid "New Wave"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:98
-msgid "Cult"
+msgid "Rave"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:99
-msgid "Gangsta Rap"
+msgid "Trailer"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:99
-msgid "Top 40"
+msgid "Lo-Fi"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:99
-msgid "Christian Rap"
+msgid "Tribal"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:100
-msgid "Pop/Funk"
+msgid "Acid Punk"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:100
-msgid "Jungle"
+msgid "Acid Jazz"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:100
-msgid "Native American"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:101
-msgid "Cabaret"
+msgid "Polka"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:101
-msgid "New Wave"
+msgid "Musical"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
+msgid "Rock & Roll"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
+msgid "Hard Rock"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
+msgid "Folk/Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
+msgid "National Folk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:102
+msgid "Swing"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
+msgid "Fast-Fusion"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
+msgid "Bebob"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
+msgid "Latin"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
+msgid "Celtic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
+msgid "Bluegrass"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
+msgid "Avantgarde"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
+msgid "Gothic Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
+msgid "Progressive Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
+msgid "Psychedelic Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:106
-msgid "Latin"
+msgid "Symphonic Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:106
-msgid "Revival"
+msgid "Slow Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
+msgid "Big Band"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
+msgid "Easy Listening"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:108
+msgid "Acoustic"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
+msgid "Humour"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
+msgid "Speech"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:108
+msgid "Chanson"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
+msgid "Opera"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
+msgid "Chamber Music"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
+msgid "Sonata"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
+msgid "Booty Bass"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:110
-msgid "Easy Listening"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:111
-msgid "Acoustic"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:111
-msgid "Humour"
+msgid "Primus"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:111
-msgid "Speech"
+msgid "Satire"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:111
-msgid "Chanson"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:112
-msgid "Opera"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:112
-msgid "Chamber Music"
+msgid "Slow Jam"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:112
-msgid "Sonata"
+msgid "Samba"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
+msgid "Folklore"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
+msgid "Rhythmic Soul"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:113
+msgid "Freestyle"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:113
+msgid "Duet"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
+msgid "Punk Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:114
-msgid "Club"
+msgid "Drum Solo"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
+msgid "A Cappella"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
+msgid "Euro-House"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
+msgid "Dance Hall"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:115
+msgid "Goa"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:116
-msgid "Rhythmic Soul"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:116
-msgid "Freestyle"
+msgid "Drum & Bass"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:116
-msgid "Duet"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:117
-msgid "Punk Rock"
+msgid "Club-House"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:116
+msgid "Hardcore"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:117
-msgid "Drum Solo"
+msgid "Terror"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:117
-msgid "A Cappella"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:118
-msgid "Euro-House"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:118
-msgid "Dance Hall"
+msgid "Indie"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:117
+msgid "BritPop"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:117
+msgid "Negerpunk"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:118
-msgid "Goa"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:119
-msgid "Drum & Bass"
+msgid "Polsk Punk"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:118
+msgid "Beat"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:118
+msgid "Christian Gangsta Rap"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:119
-msgid "Club-House"
+msgid "Heavy Metal"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:119
-msgid "Hardcore"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:120
-msgid "Terror"
+msgid "Black Metal"
+msgstr ""
+
+#: src/vorbis/fileinfo.c:119
+msgid "Crossover"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:120
-msgid "Indie"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:120
-msgid "BritPop"
+msgid "Contemporary Christian"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:120
-msgid "Negerpunk"
+msgid "Christian Rock"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:121
-msgid "Polsk Punk"
+msgid "Merengue"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:121
-msgid "Beat"
+msgid "Salsa"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:121
-msgid "Christian Gangsta Rap"
+msgid "Thrash Metal"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:122
-msgid "Heavy Metal"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:122
-msgid "Black Metal"
+msgid "Anime"
 msgstr ""
 
 #: src/vorbis/fileinfo.c:122
-msgid "Crossover"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:123
-msgid "Contemporary Christian"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:123
-msgid "Christian Rock"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:124
-msgid "Merengue"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:124
-msgid "Salsa"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:124
-msgid "Thrash Metal"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:125
-msgid "Anime"
-msgstr ""
-
-#: src/vorbis/fileinfo.c:125
 msgid "JPop"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
 "%s"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5222,11 +5405,11 @@
 msgid "General Plugin Settings:"
 msgstr ""
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr ""
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5249,11 +5432,16 @@
 "Boston, MA  02110-1301  USA"
 msgstr ""
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr ""
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr ""
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
--- a/po/ca.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/ca.po	Thu Nov 01 15:38:07 2007 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.3.0-alpha4\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-02-09 21:12+0100\n"
 "Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -15,51 +15,51 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "Quant al plugin per a àudio MPEG"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "D'acord"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "Quant a "
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -82,220 +82,223 @@
 "\n"
 "Versió de la llibreria AdPlug enllaçada: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "Configuració del plugin d'àudio MPEG"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "General"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Clip d'àudio"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 #, fuzzy
 msgid "Resolution"
 msgstr "Resolució:"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 bits"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 bits"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Canals"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Estèreo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Reproducció"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 msgid "Formats"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Format"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Títol:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Mida del fitxer:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Instrumental"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Swing"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Instrumental"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Canvi de cançó %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Parlat"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Títol:"
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "Quant al plugin d'àudio Ogg Vorbis"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -307,42 +310,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Tanca"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "D'acord"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -355,166 +360,166 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Paràmetres del mesclador:"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Anime"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Cor"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Ràtio de bits:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "Per defecte"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Bandes sonores"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Mono"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "segons"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Volum: (%)"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%s"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 msgid "Final"
 msgstr ""
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "General"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr ""
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 msgid "Reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 msgid "Use reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Opcions:"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -569,15 +574,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Tango"
@@ -625,65 +630,60 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr ""
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, fuzzy, c-format
 msgid "Default PCM device (%s)"
 msgstr "Per defecte (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 #, fuzzy
 msgid "ALSA Driver configuration"
 msgstr "Configuració del driver OSS"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Dispositiu d'àudio:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 #, fuzzy
 msgid "Mixer:"
 msgstr "Mesclador"
 
-#: src/alsa/configure.c:307
-#, fuzzy
-msgid "Use software volume control"
-msgstr "Control del volum:"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 #, fuzzy
 msgid "Mixer card:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 #, fuzzy
 msgid "Device settings"
 msgstr "Paràmetres del mesclador:"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 #, fuzzy
 msgid "Soundcard:"
 msgstr "Bandes sonores"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 #, fuzzy
 msgid "Buffer time (ms):"
 msgstr "Mida del buffer (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 #, fuzzy
 msgid "Period time (ms):"
 msgstr "Mida del buffer (ms):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr ""
 
@@ -1267,8 +1267,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Nom:"
 
@@ -1369,52 +1369,52 @@
 msgid "Concave Rectangle"
 msgstr ""
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Cap"
 
-#: src/aosd/aosd_trigger.c:73
+#: src/aosd/aosd_trigger.c:74
 #, fuzzy
 msgid "Playback Start"
 msgstr "Reproducció"
 
-#: src/aosd/aosd_trigger.c:74
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 #, fuzzy
 msgid "Title Change"
 msgstr "Canal únic"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 msgid "Volume Change"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:90
-msgid "Pause On"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:91
+msgid "Pause On"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:95
-msgid "Pause Off"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:96
+msgid "Pause Off"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
@@ -1493,134 +1493,135 @@
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 #, fuzzy
 msgid "Colors"
 msgstr "Tanca"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 #, fuzzy
 msgid "Audacious OSD - configuration"
 msgstr "Configuració del reproductor de CD"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 #, fuzzy
 msgid "Position"
 msgstr "Descripció:"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 #, fuzzy
 msgid "Animation"
 msgstr "Organització:"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 #, fuzzy
 msgid "Decoration"
 msgstr "Descripció:"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 #, fuzzy
 msgid "Trigger"
 msgstr "Tràiler"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Disco"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 #, fuzzy
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr "%s - Audacious"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1650,25 +1651,25 @@
 msgstr "Configuració del driver OSS"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Buffers:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Mida del buffer (ms):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Buffers"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1684,119 +1685,124 @@
 "Compressor simple del recorregut dinàmic per a mantenir el\n"
 "volum més o menys consistent de forma transparent."
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "Quant a l'AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Guany del disc:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Dispositiu d'àudio:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Aplica"
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Mostra o amaga la decoració"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr "/Mostra o amaga la decoració"
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr "/-"
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr "/Tanca"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Oscil·loscopi difús"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Oscil·loscopi difús: Selecció de color"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Opcions:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "Quant al plugin per a àudio MPEG"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1809,111 +1815,107 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "Quant al plugin per a àudio MPEG"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Configuració del plugin d'àudio MPEG"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Extracció d'àudio digital"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Format del títol:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 #, fuzzy
 msgid "Use cd-text if available"
 msgstr "Estèreo (si està disponible)"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 #, fuzzy
 msgid "Use CDDB if available"
 msgstr "Estèreo (si està disponible)"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Servidor"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Port:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Descodificador de música de consoles"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Baixos:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "segons"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Aguts:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Duració per defecte:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Remostreig"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Habilita el remostreig d'àudio"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Taxa de remostreig:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "Ignora la duració de les etiquetes SPC"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -1923,11 +1925,11 @@
 "La durada per defecte, expressada en segons, s'utilitza en cançons que\n"
 "no proporcionen informació sobre la seva durada (ie, pistes bucle)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "Quant al descodificador de música de consoles"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -1940,7 +1942,7 @@
 "Implemetació en l'Audacious per: William Pitcock <nenolod@nenolod.net>,\n"
 "Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -1952,27 +1954,27 @@
 "\n"
 "Eco envolvent per Carl van Schaik, 1999."
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "Quant al plugin d'eco"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Configuració de l'eco"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Retard: (ms)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Retorn: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Volum: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Eco envolvent"
 
@@ -2040,7 +2042,7 @@
 msgid "Server"
 msgstr "Servidor"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Pre-buffer (percentatge):"
@@ -2224,8 +2226,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Error"
 
@@ -2353,12 +2354,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Quant al plugin per a Scrobbler"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2395,69 +2396,60 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"No podeu utilitzar el plugin d'escriptura\n"
-"al disc en mode de temps real."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Configuració de l'escriptura al disc"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Directori de sortida:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Configuració de l'eco"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Directori de sortida:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr "Trieu un directori"
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Deixa l'extensió del fitxer"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2538,8 +2530,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2645,21 +2637,21 @@
 msgid "Tags"
 msgstr "Tango"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuració de l'escriptura al disc"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "Plugin CD d'àudio"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2669,33 +2661,163 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "Quant al plugin per a LIRC de l'Audacious"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "Quant al plugin ESounD"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "Cap"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configuració del plugin de sortida ESD"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Reproducció"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Reproducció"
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr ""
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "Synthpop"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Guany de la pista:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Dispositiu de control del volum:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Data:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Volum: (%)"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Volum: (%)"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>Hatena</b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "Quant al plugin per a Scrobbler"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Configuració del plugin de sortida ESD"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 msgid "Enable debug printing"
 msgstr ""
 
@@ -2718,15 +2840,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " Tanca "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "Quant al plugin de sortida JACK 0.17"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2744,37 +2866,37 @@
 "Portat a l'Audacious per\n"
 "Giacomo Lozito de develia.org"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Nom:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Treu un lector"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2785,15 +2907,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "Quant al plugin per a LIRC de l'Audacious"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Plugin per a LIRC"
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "Plugin per a LIRC"
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2817,12 +2939,12 @@
 "Podeu trobar informació sobre LIRC a:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: no s'ha pogut inicialitzar el suport per a LIRC\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2833,12 +2955,12 @@
 "%s: si us plau, llegiu la documentació de LIRC, per a saber\n"
 "%s: com crear un fitxer de configuració adequat\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: ordre desconeguda \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desconnectat del LIRC\n"
@@ -2895,12 +3017,12 @@
 msgid "Preamp (dB):"
 msgstr ""
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "ReplayGain"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Ignora els títols genèrics"
 
@@ -2908,7 +3030,8 @@
 msgid "ID3 format:"
 msgstr "Format ID3:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Títol"
 
@@ -2939,38 +3062,38 @@
 msgid " ID3 Tag "
 msgstr " Etiqueta ID3 "
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Títol:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Artista:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Disc:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr "Any:"
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Número de pista:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Gènere:"
 
@@ -2979,7 +3102,7 @@
 msgid "Unknown"
 msgstr "(desconegut)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -2995,7 +3118,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3040,7 +3163,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3058,16 +3181,16 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 msgid "About MPEG Audio Plugin"
 msgstr "Quant al plugin per a àudio MPEG"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "Quant a "
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3076,168 +3199,172 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tons:"
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Configuració del plugin d'àudio MPEG"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bits"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bits"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Freqüència de mostreig"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Hz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Hz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "11000 Hz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "Servidor"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Freqüència de mostreig"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
 msgid "Enable"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
 #, fuzzy
 msgid "Depth"
 msgstr "Duet"
 
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
 #, fuzzy
 msgid "Delay"
 msgstr "Retard: (ms)"
 
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "Servidor"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
 #, fuzzy
 msgid "Amount"
 msgstr "Quant a "
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
 #, fuzzy
 msgid "Range"
 msgstr "Rave"
 
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 #, fuzzy
 msgid "Surround"
 msgstr "Eco envolvent"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 #, fuzzy
 msgid "Preamp"
 msgstr "Dream"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "Informació del CD"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3251,25 +3378,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 #, fuzzy
 msgid "Samples"
 msgstr "Salsa"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Instrumental"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3279,27 +3420,22 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "Quant al plugin d'eco"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "No s'ha pogut carregar el fitxer MIDI"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3309,147 +3445,147 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Configuració de l'escriptura al disc"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Paràmetres del mesclador:"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Plugin LIRC"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Paràmetres de ReplayGain:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Prevenció de distorsions"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "Habilita el ReplayGain"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Tipus de ReplayGain:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "usa el guany/pic de la pista"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "usa el guany/pic del disc"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom d'usuari:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Guany de la pista:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Rave"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 #, fuzzy
 msgid "Remove Tag"
 msgstr "Treu un lector"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, fuzzy, c-format
 msgid "Streamversion %d"
 msgstr "Streaming"
 
-#: src/musepack/libmpc.cxx:595
+#: src/musepack/libmpc.cxx:596
 #, c-format
 msgid "Encoder: %s"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:596
-#, c-format
-msgid "Profile: %s"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
+#, c-format
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
+
+#: src/musepack/libmpc.cxx:599
 #, fuzzy, c-format
 msgid "Samplerate: %d Hz"
 msgstr "Freqüència de mostreig:"
 
-#: src/musepack/libmpc.cxx:599
+#: src/musepack/libmpc.cxx:600
 #, fuzzy, c-format
 msgid "Channels: %d"
 msgstr "Canals:"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "\n"
 "Durada total: %d:%d\n"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Mida del fitxer:"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Pic de la pista:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Guany de la pista:"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Pic del disc:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Guany del disc:"
@@ -3525,24 +3661,24 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Per defecte (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "Configuració del driver OSS"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Una un dispositiu alternatiu:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Dispositius"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Paràmetres del mesclador:"
 
@@ -3550,7 +3686,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Mesclador"
 
@@ -3594,16 +3730,16 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "El volum canvia el Master, no el PCM"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Plugin de sortida CoreAudio"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3640,27 +3776,27 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Serveis</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3668,11 +3804,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "Quant al plugin per a Scrobbler"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3682,7 +3818,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Plugin per a Scrobbler"
@@ -3695,131 +3831,131 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Configuració del plugin d'àudio MPEG"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bits"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bits"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 msgid "Resolution:"
 msgstr "Resolució:"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Canals:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Freqüència de mostreig:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3827,91 +3963,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -3920,49 +4056,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Taxa de remostreig:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -3970,284 +4106,327 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 msgid "Export"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 msgid "Import"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Mida del fitxer:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 msgid "DB-file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Duració per defecte:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Ignora els títols genèrics"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Format del títol:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Control del volum:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Títol:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 msgid "Song Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Descripció:"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 msgid "Sub-tune Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 msgid "Confirm selected action"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "Sí"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 msgid "No"
 msgstr "No"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "Quant a %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "General"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4390,6 +4569,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4403,69 +4597,69 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "Quant al driver OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Control del volum:"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Parlat"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 #, fuzzy
 msgid "Pitch"
 msgstr "Ubicació:"
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Vocal"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Configuració del driver Sun"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Ordres"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Ordre a executar quan l'Audacious comença una nova cançó."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Ordre:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Ordre a executar cap al final de la cançó."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Ordre a executar quan l'Audacious arriba al final de la llista de "
 "reproducció."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4494,7 +4688,7 @@
 "%%t: Posició a la llista de reproducció (%%02d)\n"
 "%%p: Reproducció en curs (1 o 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4502,7 +4696,7 @@
 "<span size='small'>Els paràmetres passats a la shell s'han d'encapsular en\n"
 "cometes. Altrament és un risc per a la seguretat.</span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4561,7 +4755,7 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4571,15 +4765,15 @@
 "\n"
 "Per Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "Quant al plugin d'estèreo extra"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Configuració de l'estèreo extra"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Intensitat de l'efecte:"
 
@@ -4615,31 +4809,31 @@
 msgid "Sun driver configuration"
 msgstr "Configuració del driver Sun"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "Configuració del TiMidity"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Amplada de la mostra"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "Fitxer de configuració del TiMidity"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4649,12 +4843,12 @@
 "http://libtimidity.sourceforge.net\n"
 "per Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Plugin TiMidity %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "No s'ha pogut carregar el fitxer MIDI"
 
@@ -4677,694 +4871,694 @@
 "e.g. tone://2000;2005 per a generar un to de 2000 Hz i un to\n"
 "de 2005 Hz."
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Generador de tons:"
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Plugin de sortida nul"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 msgid "Unknown error\n"
 msgstr ""
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Plugin de sortida nul"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "Quant al plugin per a àudio MPEG"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr "Etiquetes ID3:"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Configuració del plugin d'àudio Ogg Vorbis"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Etiquetes Ogg Vorbis:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Format del títol:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "Paràmetres de ReplayGain:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "Tipus de ReplayGain:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "usa el guany/pic de la pista"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "usa el guany/pic del disc"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "Habilita guany de 6dB + limit rígid"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Rock clàssic"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Country"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Dance"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disco"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Funk"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-Hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "Now Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Clàssiques"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Rock clàssic"
+msgid "Other"
+msgstr "Altres"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Country"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Dance"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Disco"
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Funk"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Grunge"
+msgid "Rock"
+msgstr "Rock"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Jazz"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Metal"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "Now Age"
+msgid "Techno"
+msgstr "Tecno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternativa"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Clàssiques"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Altres"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Bromes"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Bandes sonores"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-tecno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Tecno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Ambient"
+msgstr "Ambiental"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vocal"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternativa"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Bromes"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Bandes sonores"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-tecno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambiental"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vocal"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Fusió"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Trance"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Clàssica"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Instrumental"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Àcid"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Joc"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Clip d'àudio"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Soroll"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "Rock alternatiu"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bass"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Espacial"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
+msgid "Meditative"
+msgstr "Meditativa"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Joc"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Clip d'àudio"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Soroll"
+msgid "Instrumental Pop"
+msgstr "Pop instrumental"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "Rock alternatiu"
+msgid "Instrumental Rock"
+msgstr "Rock instrumental"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Ètnica"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gòtica"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bass"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Techno-Industrial"
+msgstr "Tecno-industrial"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Espacial"
+msgid "Electronic"
+msgstr "Electrònica"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditativa"
+msgid "Pop-Folk"
+msgstr "Pop-folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Pop instrumental"
+msgid "Dream"
+msgstr "Dream"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Rock instrumental"
+msgid "Southern Rock"
+msgstr "Rock del sud"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Ètnica"
+msgid "Comedy"
+msgstr "Comèdia"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gòtica"
+msgid "Cult"
+msgstr "De culte"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Tecno-industrial"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Electrònica"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-folk"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Dream"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Rock del sud"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Comèdia"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "De culte"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Rap gàngster"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Rap cristià"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Pop/Funk"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Americana nativa"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Cabaret"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "New Wave"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psicodèlica"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Tràiler"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid Punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polca"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retrògrada"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psicodèlica"
+msgid "Musical"
+msgstr "Musical"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
+msgid "Rock & Roll"
+msgstr "Rock & Roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Tràiler"
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Folk nacional"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polca"
+msgid "Bebob"
+msgstr "Bebop"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retrògrada"
+msgid "Latin"
+msgstr "Llatina"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Musical"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Rock & Roll"
+msgid "Celtic"
+msgstr "Cèltica"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Hard Rock"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Folk"
+msgid "Avantgarde"
+msgstr "Avantguardista"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Folk nacional"
+msgid "Gothic Rock"
+msgstr "Rock gòtic"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
+msgid "Progressive Rock"
+msgstr "Rock progressiu"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+msgid "Psychedelic Rock"
+msgstr "Rock psicodèlic"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebop"
+msgid "Symphonic Rock"
+msgstr "Rock simfònic"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Llatina"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
+msgid "Slow Rock"
+msgstr "Rock lent"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Cèltica"
+msgid "Big Band"
+msgstr "Big band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Cor"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantguardista"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Rock gòtic"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Rock progressiu"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Rock psicodèlic"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Rock simfònic"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Rock lent"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Cor"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Acústica"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Humor"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Parlat"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Chanson"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Òpera"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Música de cambra"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonata"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Simfonia"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Sàtira"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Club"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Simfonia"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folclòrica"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Balada"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Balada enèrgica"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Sàtira"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Club"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folclòrica"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Balada"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Balada enèrgica"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Soul rítmic"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Estil lliure"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Duet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Solo de bateria"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "A capella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terror"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Independent"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "Pop britànic"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Rap gàngster cristià"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Cristiana contemporània"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Rock cristià"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5373,126 +5567,126 @@
 "S'ha produït un error:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Error!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Ha fallat la modificació de l'etiqueta (obrir)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Ha fallat la modificació de l'etiqueta (tancar)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Ha fallat la modificació de l'etiqueta"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr " Etiqueta Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Data:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Versió:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "Número ISRC:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Organització:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " ReplayGain d'Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Guany de la pista:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Pic de la pista:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Guany del disc:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Pic del disc:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Informació d'Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Ràtio de bits:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Freqüència de mostreig:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Durada:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Mida del fitxer:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "N/A"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d KBit/s (nominal)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d octets"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Quant al plugin d'àudio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5628,11 +5822,11 @@
 msgid "General Plugin Settings:"
 msgstr "Paràmetres de ReplayGain:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "Quant al suport per a sndfile WAV"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5673,14 +5867,31 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "Plugin WAV sndfile"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "Quant a %s"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#, fuzzy
+#~ msgid "Use software volume control"
+#~ msgstr "Control del volum:"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "No podeu utilitzar el plugin d'escriptura\n"
+#~ "al disc en mode de temps real."
 
 #, fuzzy
 #~ msgid "Subtune Control"
@@ -5691,10 +5902,6 @@
 #~ msgstr "Ignora els títols genèrics"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Format del títol:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Control del volum:"
 
--- a/po/cs.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/cs.po	Thu Nov 01 15:38:07 2007 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins svn-1563\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-02-27 23:34+0100\n"
 "Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -17,51 +17,51 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "O modulu Flac"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "OK"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "O "
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -82,224 +82,227 @@
 "Tento modul používá knihovnu AdPlug, copyright © Simon Peter aj.\n"
 "Sestaveno s verzí knihovny AdPlug: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "AMIDI-Plug – nastavení"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Obecné"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Zvukový klip"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 bitů"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 bitů"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Kanálů"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 #, fuzzy
 msgid "Frequency"
 msgstr "Francouzština:"
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 #, fuzzy
 msgid "Formats"
 msgstr "Formát:"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 #, fuzzy
 msgid "Format selection"
 msgstr "<b>Rozpoznávání formátu</b>"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 #, fuzzy
 msgid "Format"
 msgstr "Formát:"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr "Přípona"
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Název:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr "Autor:"
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Velikost souboru:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Instrumentální"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Swing"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Instrumentální"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Změna skladby %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 #, fuzzy
 msgid "Subsong selection"
 msgstr "Výběr backendu"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Mluvené"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Filtr: "
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -311,44 +314,46 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 #, fuzzy
 msgid "Alarm"
 msgstr "Album"
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "Budiž"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 #, fuzzy
 msgid "Select Playlist"
 msgstr "Smazat seznam skladeb"
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -361,173 +366,173 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Nastavení mixéru:"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Název"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Chór"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 #, fuzzy
 msgid "minutes"
 msgstr "Čáry"
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Datový tok:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "Standardní"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 #, fuzzy
 msgid "Day"
 msgstr "Dai"
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Soundtrack"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Mono"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 #, fuzzy
 msgid "Fading"
 msgstr "Rozsvícení:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "s"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Hlasitost: (%)"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%d"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 #, fuzzy
 msgid "Final"
 msgstr "Jméno souboru"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Povolit"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 #, fuzzy
 msgid "Playlist (optional)"
 msgstr "Správce seznamů skladeb"
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 #, fuzzy
 msgid "Browse..."
 msgstr "Procházet"
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 #, fuzzy
 msgid "Reminder"
 msgstr "Styl vyobrazení"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "Uživatelem definované"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 msgid "Options"
 msgstr "Nastavení"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -582,15 +587,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Tango"
@@ -636,57 +641,53 @@
 "\n"
 "Autor: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Neznámá zvuková karta"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Implicitní PCM zařízení (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "Nastavení ovladače ALSA"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Zvukové zařízení:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Mixér:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Hlasitost ovládat softwarově"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Karta s mixérem:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Zařízení mixéru:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Nastavení zařízení"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Zvuková karta:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Velikost vyrovnávací paměti (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "Perioda (ms):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Pokročilá nastavení"
 
@@ -1396,8 +1397,8 @@
 "backend</span>"
 msgstr "<span size=\"small\">def</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1498,23 +1499,23 @@
 msgid "Concave Rectangle"
 msgstr "Konkávní obdélník"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Žádný"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "Zahájení přehrávání"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Zahájení přehrávání"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Spustí OSD, když je hrána skladba."
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "Změna názvu"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 #, fuzzy
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
@@ -1525,32 +1526,32 @@
 "je stále stejné. To se hodí při přehrávání internetových proudů, v nichž se "
 "střídají skladby."
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Změna názvu"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 #, fuzzy
 msgid "Triggers OSD when volume is changed."
 msgstr "Spustí OSD, když je hrána skladba."
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 #, fuzzy
 msgid "Pause On"
 msgstr "Pozastavit"
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 #, fuzzy
 msgid "Triggers OSD when playback is paused."
 msgstr "Spustí OSD, když je hrána skladba."
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 #, fuzzy
 msgid "Pause Off"
 msgstr "Pozastavit na"
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 #, fuzzy
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Spustí OSD, když je hrána skladba."
@@ -1631,123 +1632,124 @@
 msgid "Select Skin File"
 msgstr "Vyberte soubor se skinem"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "Styl vyobrazení"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "Vlastní skin:"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr "Soubor se skinem:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Povolit spouštěč"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Událost"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 #, fuzzy
 msgid "Transparency"
 msgstr "Transponovat: "
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 #, fuzzy
 msgid "Fake transparency"
 msgstr "Povolit průhlednost seznamu skladeb"
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "OSD pro Audacious – nastavení"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Vyzkoušet"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Animace"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "OSD pro Audacious – o modulu"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1755,7 +1757,7 @@
 "\n"
 "OSD pro Audacious "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 #, fuzzy
 msgid ""
 "\n"
@@ -1794,25 +1796,25 @@
 msgstr "Nastavení ovladače aRts"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Vyrovnávání:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Velikost vyrovnávací paměti (ms):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Vyrovnávání"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1828,121 +1830,126 @@
 "Jednoduchý zhušťovač dynamických rozsahů pro snadné\n"
 "udržení hlasitosti na více méně stejné úrovni."
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "O AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "Nastavení programu"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Zesílení alba:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 #, fuzzy
 msgid "Load default values"
 msgstr "Uložit standardní předvolbu"
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Zvukové zařízení:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Použít"
 
-#: src/blur_scope/blur_scope.c:57
+#: src/blur_scope/blur_scope.c:54
 msgid "/Toggle Decorations"
 msgstr "/Přepnout zobrazení dekorací"
 
-#: src/blur_scope/blur_scope.c:59
+#: src/blur_scope/blur_scope.c:56
 msgid "/-"
 msgstr "/-"
 
-#: src/blur_scope/blur_scope.c:60
+#: src/blur_scope/blur_scope.c:57
 msgid "/Close"
 msgstr "/Zavřít"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Blur scope"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Blur scope: výběr barvy"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Volby:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 #, fuzzy
 msgid "Add CD"
 msgstr "Přidat CD…"
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "O modulu LIRC pro Audacious"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1955,12 +1962,7 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "O modulu LIRC pro Audacious"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
@@ -1970,99 +1972,100 @@
 "\n"
 "Není vloženo CD, nebo vložené CD není typu Audio CD.\n"
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Nastavení modulu MPEG Audio"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Digitálně"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Formát názvu:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 #, fuzzy
 msgid "Use cd-text if available"
 msgstr "Pokud možno, používat bitmapové fonty"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 #, fuzzy
 msgid "Use CDDB if available"
 msgstr "Pokud možno, používat bitmapové fonty"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Server"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Port:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Dekodér konzolové hudby"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Hloubky:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "s"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Implicitní délka skladby:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Převzorkování"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Povolit převzorkování zvuku"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Převzorkovat na:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovat délku z SPC tagů"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -2072,11 +2075,11 @@
 "Implicitní délka, vyjádřená v sekundách, se použije na skladby, které "
 "neposkytují informace o délce (např. nekonečné smyčky)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "O dekodéru konzolové hudby"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2088,7 +2091,7 @@
 "Implementace v Audacious: William Pitcock <nenold@nenold.net>,\n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2100,27 +2103,27 @@
 "\n"
 "Surround echo přidal Carl van Schaik, 1999"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "O modulu ozvěny"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Nastavit ozvěnu"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Zpoždění: (ms)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Zpětná vazba: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Hlasitost: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Surround echo"
 
@@ -2186,7 +2189,7 @@
 msgid "Server"
 msgstr "Server"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Načíst předem (v procentech):"
@@ -2393,8 +2396,7 @@
 "Nelze otevřít okno s vazbami pro nerozpoznané zařízení.\n"
 "Ujistěte se, že zařízení bylo správně zapojeno."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Chyba"
 
@@ -2537,12 +2539,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "O modulu Flac"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2577,69 +2579,60 @@
 "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"Disk writer nelze použít, pokud\n"
-"jste v režimu reálného času."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Nastavení Disk Writeru"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Nastavit ozvěnu"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Nezkracovat příponu jména souboru"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2724,8 +2717,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr "Kvalita"
 
@@ -2837,21 +2830,21 @@
 msgid "Tags"
 msgstr "Tag:"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavení Disk Writeru"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "FLAC Audio modul"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2861,34 +2854,167 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "FLAC Audio modul"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "O modulu ESounD"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "žádné"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Nastavení výstupního ESD modulu"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "<b>Přehrávání</b>"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+#, fuzzy
+msgid "Previous Track:"
+msgstr "Předchozí"
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "/Pozastavit"
+
+#: src/hotkey/plugin.c:801
+#, fuzzy
+msgid "Pause:"
+msgstr "/Pozastavit"
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "Zastavit"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Zesílení skladby:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Zařízení ovládání hlasitosti:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Datum:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Hlasitost: (%)"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Hlasitost → Snížit o 5"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>Název: </b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+#, fuzzy
+msgid "Jump to File:"
+msgstr "Přejít na čas"
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "O modulu Scrobbler"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 #, fuzzy
 msgid "Connect to no ports"
 msgstr "Nelze se připojit k %s"
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Nastavení výstupního ESD modulu"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Polovlit detorování"
@@ -2912,15 +3038,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " Zavřít "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupním modulu JACK 0.17"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2938,39 +3064,39 @@
 "Pro Audacious převedl\n"
 "Giacomo Lozito z develia.org"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Jméno:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 #, fuzzy
 msgid "Installed plugins"
 msgstr "Všechny moduly"
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 #, fuzzy
 msgid "Running plugins"
 msgstr "Jen moduly bez GL"
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Odstranit tag"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2981,15 +3107,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "O modulu LIRC pro Audacious"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Modul LIRC "
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "Modul LIRC "
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -3013,12 +3139,12 @@
 "Informace o LIRC lze získat na:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: nelze inicializovat podporu LIRC\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -3029,12 +3155,12 @@
 "%s: prosím, přečtěte si dokumentaci k LIRC,\n"
 "%s: jak správně vytvořit konfigurační soubor\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: neznámý příkaz „%s“\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: odpojeno od LIRC\n"
@@ -3087,12 +3213,12 @@
 msgid "Preamp (dB):"
 msgstr "Předzesílení (dB):"
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "Zesílení přehrávání"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Přepsat původní názvy"
 
@@ -3100,7 +3226,8 @@
 msgid "ID3 format:"
 msgstr "Formát ID3:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Název"
 
@@ -3131,38 +3258,38 @@
 msgid " ID3 Tag "
 msgstr " ID3 popis "
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Název:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Umělec:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Album:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr "Rok:"
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Číslo stopy:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Žánr:"
 
@@ -3171,7 +3298,7 @@
 msgid "Unknown"
 msgstr "(není známo)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -3187,7 +3314,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3232,7 +3359,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3250,17 +3377,17 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 #, fuzzy
 msgid "About MPEG Audio Plugin"
 msgstr "Modul MPEG Audio"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "O "
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3269,169 +3396,173 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor tónů:"
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Flac – nastavení"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bitů"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bitů"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Vzorkovací kmitočet"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr "Nejbližší (nejrychlejší)"
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr "Lineární (rychlé)"
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr "Spline (kvalitní)"
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr "FIR filtr osmého řádu (velmi kvalitní)"
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Hz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Hz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "11000 Hz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr "Nejbližší (nejrychlejší)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr "Lineární (rychlé)"
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr "Spline (kvalitní)"
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr "FIR filtr osmého řádu (velmi kvalitní)"
-
-#: src/modplug/gui/interface.cxx:346
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Vzorkovací kmitočet"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
+msgid "Enable"
+msgstr "Povolit"
+
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
+#, fuzzy
+msgid "Depth"
+msgstr "Duet"
+
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
+#, fuzzy
+msgid "Delay"
+msgstr "Hrát"
+
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "dozvuk"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
+msgid "Amount"
+msgstr "Množství"
+
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
+#, fuzzy
+msgid "Range"
+msgstr "Obdélník"
+
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr "Zvýraznění hlubokých tónů"
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
+#, fuzzy
+msgid "Surround"
+msgstr "Surround echo"
+
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
+#, fuzzy
+msgid "Preamp"
+msgstr "Předzesílení:"
+
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
 msgid "Use Filename as Song Title"
 msgstr "Použít jméno souboru jako název skladby"
 
-#: src/modplug/gui/interface.cxx:353
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
 #, fuzzy
 msgid "Fast Playlist Info"
 msgstr "Načíst seznam skladeb"
 
-#: src/modplug/gui/interface.cxx:368
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
 msgid "Noise Reduction"
 msgstr "Redukce šumu"
 
-#: src/modplug/gui/interface.cxx:376
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
 msgid "Play Amiga MOD"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "dozvuk"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
-msgid "Enable"
-msgstr "Povolit"
-
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
-#, fuzzy
-msgid "Depth"
-msgstr "Duet"
-
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
-#, fuzzy
-msgid "Delay"
-msgstr "Hrát"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Zvýraznění hlubokých tónů"
-
-#: src/modplug/gui/interface.cxx:510
-msgid "Amount"
-msgstr "Množství"
-
-#: src/modplug/gui/interface.cxx:519
-#, fuzzy
-msgid "Range"
-msgstr "Obdélník"
-
-#: src/modplug/gui/interface.cxx:528
-#, fuzzy
-msgid "Surround"
-msgstr "Surround echo"
-
-#: src/modplug/gui/interface.cxx:600
-#, fuzzy
-msgid "Preamp"
-msgstr "Předzesílení:"
-
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 #, fuzzy
 msgid "Don't loop"
 msgstr "Bodová vlnovka"
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr "čas (s)"
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "Informace o CD"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3455,24 +3586,48 @@
 "Vzory:\n"
 "Kanálů:"
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 msgid "Samples"
 msgstr "Vzorky"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Instrumentální"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3482,26 +3637,21 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 msgid "About Modplug"
 msgstr "O modulu Modplug"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nebylo možné nahrát MIDI soubor"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3511,144 +3661,144 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Nastavení Disk Writeru"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Nastavení mixéru:"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Modul LIRC"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Nastavení pro zesílení přehrávání:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Povolit prevenci před oříznutím"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "Zapnout zesílení pro přehrávání"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Typ zesílení pro přehrávání:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "použít zesílení/vrcholu skladby"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "použít zesílení/vrchol alba"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "Jméno souboru:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Zesílení skladby:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Uložit"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "Odstranit tag"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, fuzzy, c-format
 msgid "Streamversion %d"
 msgstr "Vysílání"
 
-#: src/musepack/libmpc.cxx:595
+#: src/musepack/libmpc.cxx:596
 #, c-format
 msgid "Encoder: %s"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:596
+#: src/musepack/libmpc.cxx:597
 #, fuzzy, c-format
 msgid "Profile: %s"
 msgstr "Ze souboru"
 
-#: src/musepack/libmpc.cxx:597
+#: src/musepack/libmpc.cxx:598
 #, c-format
 msgid "Average bitrate: %6.1f kbps"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:598
+#: src/musepack/libmpc.cxx:599
 #, c-format
 msgid "Samplerate: %d Hz"
 msgstr "Vzorkovací kmitočet: %d Hz"
 
-#: src/musepack/libmpc.cxx:599
+#: src/musepack/libmpc.cxx:600
 #, c-format
 msgid "Channels: %d"
 msgstr "Kanálů: %d"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "Vzorků: %llu\n"
 "Délka: %d:%.2d"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Velikost souboru: %ld B"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Vrchol skladby:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Zesílení stopy při přehrávání: %+2.2f dB"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Vrchol alba:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Zesílení alba při přehrávání: %+2.2f dB"
@@ -3722,24 +3872,24 @@
 "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Standardně (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "Nastavení ovladače OSS"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Použít jiné zařízení:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Zařízení"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Nastavení mixéru:"
 
@@ -3748,7 +3898,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr "Pauza mezi skladbami"
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Mixér"
 
@@ -3790,16 +3940,16 @@
 "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "Hlasitost ovládána Master kanálem místo PCM"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Základní zvukový výstupní modul"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3834,27 +3984,27 @@
 "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Služby</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Přístupové jméno:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3862,11 +4012,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "O modulu Scrobbler"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3876,7 +4026,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Modul Scrobbler"
@@ -3889,133 +4039,133 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "OSD pro Audacious – nastavení"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bitů"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bitů"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 msgid "Resolution:"
 msgstr "Rozlišení:"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Kanálů"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Vzorkovací kmitočet:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Tempo přehrávání"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 #, fuzzy
 msgid "Force model"
 msgstr "Režim stopy"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -4023,92 +4173,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Způsob přehrávání:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transponovat: "
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mód mmap"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -4117,50 +4267,50 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 #, fuzzy
 msgid "SIDPlay 2 options:"
 msgstr "Hrát z adresy"
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Převzorkovat na:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4168,297 +4318,340 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 #, fuzzy
 msgid "Emulate filters"
 msgstr "Přehrát soubory"
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 #, fuzzy
 msgid "SIDPlay1"
 msgstr "Hrát"
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 #, fuzzy
 msgid "Export"
 msgstr "Importovat"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 msgid "Import"
 msgstr "Importovat"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Filtr: "
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 #, fuzzy
 msgid "SIDPlay2"
 msgstr "Hrát"
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 #, fuzzy
 msgid "Filters"
 msgstr "Filtr: "
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Hrát normální rychlostí"
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Způsob přehrávání:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Soubor zařízení:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Implicitní délka skladby:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Přepsat původní názvy"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Formát názvu:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 #, fuzzy
 msgid "Add sub-tunes to playlist"
 msgstr "Do seznamu skladeb přidá soubory."
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Ovládání hlasitosti:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Do soubu"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr "Modul Audacious"
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 #, fuzzy
 msgid "Songname:"
 msgstr "Snížit vzorkovací kmitočet:"
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Autorská práva:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 #, fuzzy
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Výzdoba"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 #, fuzzy
 msgid "Confirm selected action"
 msgstr "<b>Rozpoznávání formátu</b>"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 msgid "No"
 msgstr "Ne"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "O %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "Obecné"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4602,6 +4795,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
+
+#: src/sid/xs_slsup.c:224
+#, fuzzy, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
+
+#: src/sid/xs_slsup.c:233
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4615,67 +4823,67 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "O modulu OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Ovládání hlasitosti:"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Mluvené"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 #, fuzzy
 msgid "Pitch"
 msgstr "Cesta:"
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Uložit"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Nastavení ovladače pro Sun"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Příkaz, který se provede, když Audacious začne novou skladbu."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Příkaz, který se provede na konci skladby."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Příkaz, který se provede, když Audacious dosáhe konce seznamu skladeb."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4704,7 +4912,7 @@
 "%%t: pozice v seznamu skladeb (%%02d)\n"
 "%%p: právě se hraje (1, nebo 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4712,7 +4920,7 @@
 "<span size='small'>Parametry předávané shellu by měly být uzavřeny do "
 "uvozovek. Nerespektování této rady představuje bezpečnosti riziko.</span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 #, fuzzy
 msgid "Spectrum Analyzer"
 msgstr "Sloupce"
@@ -4779,7 +4987,7 @@
 msgid "Change playing song"
 msgstr "Chong Kai Xiong"
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4789,15 +4997,15 @@
 "\n"
 "Napsal Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "O modulu Extra sterou"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Nastavit Extra sterou"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Síla efektu:"
 
@@ -4833,31 +5041,31 @@
 msgid "Sun driver configuration"
 msgstr "Nastavení ovladače pro Sun"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "Nastavení TiMidity"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Šířka vzorku"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "Konfigurační souboru Title"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4867,12 +5075,12 @@
 "http://libtimidity.sourceforge.net\n"
 "napsal Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Modul TiMidity %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "Nebylo možné nahrát MIDI soubor"
 
@@ -4894,696 +5102,696 @@
 "Pro jeho aktivaci zadejte URL: tone://frekvence1;frekvence2;frekvence3;...\n"
 "např. tone://2000;2005 pro přehrání tónů o frekvenci 2000 a 2005 Hz."
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 #, fuzzy
 msgid "Can't read from file\n"
 msgstr "Načíst předvolbu ze souboru"
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Slepý výstupní modul "
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Neznámá zvuková karta"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Vstupní modul: %s"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr "ID3 tagy:"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Nastavení modulu Ogg Vorbis Audio"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Ogg Vorbis Info:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Formát názvu:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "Nastavení pro zesílení přehrávání:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "Typ zesílení pro přehrávání:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "použít zesílení/vrcholu skladby"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "použít zesílení/vrchol alba"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "Povolit 6dB zesílení + tvrdé omezení"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Klasický rock"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Country"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Taneční"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disko"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Funk"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Oldies"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Klasický rock"
+msgid "Other"
+msgstr "Jiný"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Country"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Taneční"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Disko"
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Funk"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Grunge"
+msgid "Rock"
+msgstr "Rock"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Hip-hop"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Jazz"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Metal"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "New Age"
+msgid "Techno"
+msgstr "Techno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternativní hudba"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Oldies"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Jiný"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Žerty"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Techno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vokální"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternativní hudba"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Žerty"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Soundtrack"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambient"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vokální"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Fúze"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Trance"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Instrumentální"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Acid"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Hra"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Zvukový klip"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Šum"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "Alternativní rock"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bass"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Space"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
+msgid "Meditative"
+msgstr "Meditativní"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Hra"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Zvukový klip"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Šum"
+msgid "Instrumental Pop"
+msgstr "Instrumentální pop"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "Alternativní rock"
+msgid "Instrumental Rock"
+msgstr "Instrumentální Rock"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Etnická hudba"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gotická hudba"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bass"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Techno-Industrial"
+msgstr "Techno-Industrial"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Space"
+msgid "Electronic"
+msgstr "Elektronická"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditativní"
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Instrumentální pop"
+msgid "Dream"
+msgstr "Dream"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Instrumentální Rock"
+msgid "Southern Rock"
+msgstr "Jižanský rock"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Etnická hudba"
+msgid "Comedy"
+msgstr "Komedie"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gotická hudba"
+msgid "Cult"
+msgstr "Kult"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Techno-Industrial"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Elektronická"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Dream"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Jižanský rock"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Komedie"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Kult"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Křesťanský rap"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Pop/Funk"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Indiánská hudba"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Kabaret"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "Nová vlna"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelická"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Trailer"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelická"
+msgid "Musical"
+msgstr "Muzikál"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
+msgid "Rock & Roll"
+msgstr "Rock 'n' roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Trailer"
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Národní lidová"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid punk"
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid jazz"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
+msgid "Bebob"
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
+msgid "Latin"
+msgstr "Latinská"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Muzikál"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Rock 'n' roll"
+msgid "Celtic"
+msgstr "Keltská hudba"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Hard rock"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Folk"
+msgid "Avantgarde"
+msgstr "Avantgardní"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Národní lidová"
+msgid "Gothic Rock"
+msgstr "Gotický rock"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
+msgid "Progressive Rock"
+msgstr "Progresivní rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+msgid "Psychedelic Rock"
+msgstr "Psychedelický rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
+msgid "Symphonic Rock"
+msgstr "Symfonický rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Latinská"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
+msgid "Slow Rock"
+msgstr "Ploužák"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Keltská hudba"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chór"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantgardní"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Gotický rock"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Progresivní rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Psychedelický rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Symfonický rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Ploužák"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chór"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Příjemné poslouchání"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Akustická"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Humor"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Mluvené"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Šanson"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Opera"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Komorní hudba"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonáta"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Symfonie"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Satira"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Klub"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Symfonie"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folklór"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Balada"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Rocková balada"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Satira"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Klub"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folklór"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Balada"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Rocková balada"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Rytmický soul"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Duet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Drum Solo"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "A Cappella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terror"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "Britpop"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Křesťanský Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Moderní křesťanská"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Křesťanský rock"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5592,126 +5800,126 @@
 "Nastala chyba:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Chyba!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Změna tagu se nezdařila (otevření)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Změna tagu se nezdařila (zavření)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Nepodařilo se upravit informace"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr "Popis Ogg Vorbis souboru"
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Umístění:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Verze:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "Číslo ISRC:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Organizace:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Zesílení Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Zesílení skladby:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Vrchol skladby:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Zesílení alba:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Vrchol alba:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Ogg Vorbis Info "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Datový tok:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Vzorkovací kmitočet:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Délka:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Velikost souboru:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "není známo"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d kb/s (jmenovitý tok)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d bajtů"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5847,11 +6055,11 @@
 msgid "General Plugin Settings:"
 msgstr "_Seznam obecných modulů:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "O podpoře snffile WAV"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5892,23 +6100,35 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA  02110-1301  USA"
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "Modul sndfile WAV"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "O %s"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Hlasitost ovládat softwarově"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "Disk writer nelze použít, pokud\n"
+#~ "jste v režimu reálného času."
 
 #, fuzzy
 #~ msgid "Subtune Control"
 #~ msgstr "Ovládání hlasitosti:"
 
-#, fuzzy
-#~ msgid "Could not allocate sidFilename ('%s')\n"
-#~ msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
-
 #~ msgid "Load"
 #~ msgstr "Načíst"
 
@@ -5917,10 +6137,6 @@
 #~ msgstr "Přepsat původní názvy"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Formát názvu:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Ovládání hlasitosti:"
 
@@ -6416,9 +6632,6 @@
 #~ msgid "Noise shaping"
 #~ msgstr "Tvarování šumu"
 
-#~ msgid "none"
-#~ msgstr "žádné"
-
 #~ msgid "low"
 #~ msgstr "nízké"
 
@@ -6767,9 +6980,6 @@
 #~ msgid "stereo"
 #~ msgstr "stereo"
 
-#~ msgid "Jump to Time"
-#~ msgstr "Přejít na čas"
-
 #~ msgid "minutes:seconds"
 #~ msgstr "minuty:sekundy"
 
@@ -6932,12 +7142,6 @@
 #~ msgid "Play CD"
 #~ msgstr "Přehrát CD"
 
-#~ msgid "Stop"
-#~ msgstr "Zastavit"
-
-#~ msgid "Previous"
-#~ msgstr "Předchozí"
-
 #~ msgid "Visualization"
 #~ msgstr "Znázornění"
 
@@ -7650,9 +7854,6 @@
 #~ "Tento způsob je o něco pomalejší než rozpoznávání na požádání, ale "
 #~ "poskytuje alespoň základní úroveň rozpoznání formátu. "
 
-#~ msgid "<b>Playback</b>"
-#~ msgstr "<b>Přehrávání</b>"
-
 #~ msgid ""
 #~ "When Audacious starts, automatically begin playing from the point where "
 #~ "we stopped before."
@@ -7915,9 +8116,6 @@
 #~ msgid "/Peaks Falloff/Fastest"
 #~ msgstr "/Klesání vrcholků/Nejrychlejší"
 
-#~ msgid "/Pause"
-#~ msgstr "/Pozastavit"
-
 #~ msgid "/Jump to Time"
 #~ msgstr "/Přejít na čas"
 
@@ -8145,29 +8343,6 @@
 #~ "Jméno souboru a název skladby je lépe napsat do uvozovek (\"), jinak může "
 #~ "být ohrožena bezpečnost počítače. Chcete přesto pokračovat?"
 
-#~ msgid ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-#~ msgstr ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-
 #~ msgid "Convert non-UTF8 ID3 tags to UTF8"
 #~ msgstr "Převést ID3 tagy z jiných kódování do UTF-8"
 
--- a/po/cy.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/cy.po	Thu Nov 01 15:38:07 2007 +0100
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.3\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-02-12 03:37-0600\n"
 "Last-Translator: William Pitcock <nenolod@sacredspiral.co.uk>\n"
 "Language-Team: Welsh <i18n+cy@sacredspiral.co.uk>\n"
@@ -15,51 +15,51 @@
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "Ynghylch Ategyn Sain MPEG"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "Iawn"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "Ynghylch"
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -81,222 +81,225 @@
 "Peter, et al.\n"
 "Fersiwn cynnwys AdPlug llyfrgell:"
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "AMIDI-Plug - ffurfweddu"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Dileu"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Cyffredinol"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Clip Sain"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 #, fuzzy
 msgid "Resolution"
 msgstr "Cydraniad:"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 did"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 did"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Sianeli:"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Chwarae"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 #, fuzzy
 msgid "Formats"
 msgstr "Fformat:"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 #, fuzzy
 msgid "Format"
 msgstr "Fformat:"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Enw ffeil"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Teitl:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Maint ffeil:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Offerynnol"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Swing"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Offerynnol"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Newid Cân %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Llais"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Teitl:"
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "Ynghylch Ategyn Ogg Vorbis"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -308,42 +311,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Cau"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "Iawn"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -356,169 +361,169 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Gosodiadau Cymysgu"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Teitl"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Chorus"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Didradd:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Trac Sain"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Mono"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 #, fuzzy
 msgid "Fading"
 msgstr "cynnydd"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "eiliad"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Sain:(%)"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%d"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 #, fuzzy
 msgid "Final"
 msgstr "Enw ffeil"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Cyffredinol"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr ""
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 msgid "Reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "User Defined"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Dewisiadau:"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -573,15 +578,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Tango"
@@ -627,57 +632,53 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Cerdyn sain anhysbys"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Dyfais PCM rhagosodedig (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "Ffurfweddu'r Gyrrwr ALSA"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Dyfais sain:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Cymysgydd:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Defnyddio rheolwr sain meddalwedd"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Cerdyn cymysgu"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Dyfais cymysgu"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Gosodiadau dyfais"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Cerdyn sain:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Amser byffer (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "Cyfnod amser (ms):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Gosodiadau uwch"
 
@@ -1245,8 +1246,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Enw:"
 
@@ -1347,51 +1348,51 @@
 msgid "Concave Rectangle"
 msgstr "Cyfongl Cafniog"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Dim"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "Cychwyn Chwarae"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Cychwyn Chwarae"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "Newid Teitl"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Newid Teitl"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:90
-msgid "Pause On"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:91
+msgid "Pause On"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:95
-msgid "Pause Off"
-msgstr ""
-
 #: src/aosd/aosd_trigger.c:96
+msgid "Pause Off"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
@@ -1470,124 +1471,125 @@
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Eiliwiau"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Eiliwiau"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Galluogi clicied"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Achlysur"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - ffurfweddiad"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Prawf"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 #, fuzzy
 msgid "Position"
 msgstr "Disgrifiad:"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 #, fuzzy
 msgid "Animation"
 msgstr "Corff:"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Testun"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Addurniad"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 #, fuzzy
 msgid "Trigger"
 msgstr "Trailer"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Disgo"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - ynghylch"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1595,7 +1597,7 @@
 "\n"
 "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 #, fuzzy
 msgid ""
 "\n"
@@ -1634,25 +1636,25 @@
 msgstr "Ffurfweddu'r Gyrrwr aRts"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Byffyru:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Maint y byffer (ms):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Byffyru:"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1668,119 +1670,124 @@
 "Seml deinamig amrediad cywasgu am tryloyw\n"
 "cadw'r yr cyfrol lefel rhyw yr unrhyw"
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "Ynghylch AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Cynydd albwm:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Dyfais sain:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Gosod"
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Toggle Decorations"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr "/Toggle Decorations"
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr "/-"
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr "/Cau"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Blur scope"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Color selection"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "Ynghylch Ategyn Sain MPEG"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1793,111 +1800,107 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "Ynghylch Ategyn Sain MPEG"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Ffurfweddiad Chwaraeydd MPEG Sain"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Tynnu awdio digidôl"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Fformat y teitl:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 #, fuzzy
 msgid "Use cd-text if available"
 msgstr "Stereo (os ar gael)"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 #, fuzzy
 msgid "Use CDDB if available"
 msgstr "Stereo (os ar gael)"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Gwasanaethwr"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Porth:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Chwaraeydd Sbort Modiwl"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Bas"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "eiliad"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Trebl:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Hyd cân rhagosodedig:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Samplo"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Gallougi sain dyblusampl"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Graddfa Samplo"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "Diystyru hyd am SPC tagiau"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -1907,11 +1910,11 @@
 "Rhagosodedig hyd sain, mynegiau yn eiliad, ys gallougi am sain pa arlwyo na "
 "hyd gwybodaeth (dollenau trac)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "Ynghylch Ategyn Cerdd Console"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -1923,7 +1926,7 @@
 "Audacious fersiwn at: William Pitcock <nenolod@nenolod.net>, \n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -1935,27 +1938,27 @@
 "\n"
 "Surround echo gan Carl van Schaik 1999"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "Ynghylch Ategyn Echo"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Ffurfweddu Echo"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Oediad: (ms)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Adborth: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Sain:(%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Adlais o amgylch"
 
@@ -2023,7 +2026,7 @@
 msgid "Server"
 msgstr "Gwasanaethwr"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Cyn fyffer (y cant):"
@@ -2207,8 +2210,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Gwall"
 
@@ -2336,12 +2338,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Ynghylch Ategyn Echo"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2378,70 +2380,60 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"Nid oes modd defnyddio ategyn Disk Writer\n"
-"\n"
-"pan fyddwch yn rhedeg ym modd realtime."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Ffurfweddiad Disk Writer"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Ffurfweddu Echo"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr "Dewis cyfeiriadur"
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Cadw enw ffeil estyniad"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2522,8 +2514,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2629,21 +2621,21 @@
 msgid "Tags"
 msgstr "Tango"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Ffurfweddiad Disk Writer"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "Ategynnau Sain FLAC"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2653,33 +2645,163 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "Ategynnau Sain FLAC"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "Ynghylch Ategyn ESounD"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "Dim"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Ffurfweddu Ategyn ESD"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Chwarae"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Chwarae"
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr ""
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "Synthpop"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Cynnydd trac:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Dyfais rheoli sain:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Dyddiad!"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Sain:(%)"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Sain:(%)"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>Hatena</b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "Ynghylch Ategyn Scrobbler"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Ffurfweddu Ategyn ESD"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Galluogi ReplayGain"
@@ -2703,15 +2825,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr "Cau"
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "Ynghylch Ategyn Allbwn JACK 0.17"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2729,37 +2851,37 @@
 "Audacious ategyn gan\n"
 "Giacomo Lozito o develia.org"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Enw:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Tynnu gyrrwr"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2770,15 +2892,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "Ynghylch Audacious Ategyn LIRC"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Ategyn LIRC"
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "Ategyn LIRC"
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2792,12 +2914,12 @@
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 msgstr ""
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: methu â ymgychwyn LIRC ateg\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2808,12 +2930,12 @@
 "%s: plesio darllen yn dogfennau am LIRC\n"
 "%s: pa at creu y addas ffurfweddiad ffeil\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: gorchymyn anhysbys \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: datgysylltu am LIRC\n"
@@ -2870,12 +2992,12 @@
 msgid "Preamp (dB):"
 msgstr ""
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "ReplayGain"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Diystyru'r teitlau cyffredinol"
 
@@ -2883,7 +3005,8 @@
 msgid "ID3 format:"
 msgstr "Fformat ID3:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Teitl"
 
@@ -2914,38 +3037,38 @@
 msgid " ID3 Tag "
 msgstr "Tag ID3"
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Teitl:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Artist:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Albwm:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr "Blwyddyn:"
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Rhif y Trac:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Math:"
 
@@ -2954,7 +3077,7 @@
 msgid "Unknown"
 msgstr "(anhysbys)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -2970,7 +3093,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3015,7 +3138,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3033,16 +3156,16 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 msgid "About MPEG Audio Plugin"
 msgstr "Ynghylch Ategyn Sain MPEG"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "Ynghylch"
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3051,169 +3174,173 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Cynhyrchydd Tôn:"
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Ffurfweddiad TiMidity"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 did"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 did"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Graddfa Samplo"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Hz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Hz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "11000 Hz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "adlais"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Graddfa Samplo"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
 #, fuzzy
 msgid "Enable"
 msgstr "Galluogi clicied"
 
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
 #, fuzzy
 msgid "Depth"
 msgstr "Duet"
 
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
 #, fuzzy
 msgid "Delay"
 msgstr "Oediad: (ms)"
 
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "adlais"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
 #, fuzzy
 msgid "Amount"
 msgstr "Ynghylch"
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
 #, fuzzy
 msgid "Range"
 msgstr "Cyfongl"
 
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 #, fuzzy
 msgid "Surround"
 msgstr "Adlais o amgylch"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 #, fuzzy
 msgid "Preamp"
 msgstr "Dream"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "Gwybodaeth am y CD"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3227,25 +3354,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 #, fuzzy
 msgid "Samples"
 msgstr "Salsa"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Offerynnol"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3255,27 +3396,22 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "Ynghylch Ategyn Echo"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Meth agor dyfais ffeil MIDI"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3285,147 +3421,147 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Ffurfweddiad Disk Writer"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Gosodiadau Cymysgu"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Ategyn LIRC"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Gosodiadau'r ReplayGain:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Galluogi Atal Clipio"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "Galluogi ReplayGain"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Math ReplayGain:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "defnyddiwch Cynnydd/Brig Trac"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "defnyddio Cynnydd/Brig Albwm"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 #, fuzzy
 msgid "Filename:"
 msgstr "Enw Defnyddiwr:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Cynnydd trac:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Rave"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 #, fuzzy
 msgid "Remove Tag"
 msgstr "Tynnu gyrrwr"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, fuzzy, c-format
 msgid "Streamversion %d"
 msgstr "Llifo"
 
-#: src/musepack/libmpc.cxx:595
+#: src/musepack/libmpc.cxx:596
 #, c-format
 msgid "Encoder: %s"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:596
-#, c-format
-msgid "Profile: %s"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
+#, c-format
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
+
+#: src/musepack/libmpc.cxx:599
 #, fuzzy, c-format
 msgid "Samplerate: %d Hz"
 msgstr "Graddfa samplo:"
 
-#: src/musepack/libmpc.cxx:599
+#: src/musepack/libmpc.cxx:600
 #, fuzzy, c-format
 msgid "Channels: %d"
 msgstr "Sianeli:"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "\n"
 "Cyfanswm hyd: %d:%.2d\n"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Maint ffeil:"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Brig trac:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Cynnydd trac:"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Brig albwm:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Cynydd albwm:"
@@ -3501,24 +3637,24 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Rhagosodedig (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "Ffurfweddu'r Gyrrwr OSS"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Defnyddiwr ddyfais arall:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Gosodiadau Cymysgu"
 
@@ -3526,7 +3662,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Cymysgwr"
 
@@ -3570,16 +3706,16 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "Nid yw'r Prif reolwr sain yn PCM"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Ategyn Allbwn CoreAudio"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3616,27 +3752,27 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Gwasanaethau</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Enw Defnyddiwr:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3644,11 +3780,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "Ynghylch Ategyn Scrobbler"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3658,7 +3794,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Ategyn Scrobbler"
@@ -3671,134 +3807,134 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Audacious OSD - ffurfweddiad"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 did"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 did"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 #, fuzzy
 msgid "Resolution:"
 msgstr "Cydraniad:"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Sianeli:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Graddfa samplo:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Chwarae cyflymedd"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 #, fuzzy
 msgid "Force model"
 msgstr "Enwau'r Traciau:"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3806,91 +3942,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -3899,49 +4035,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Graddfa Samplo"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -3949,292 +4085,335 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 #, fuzzy
 msgid "Export"
 msgstr "Porth"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 #, fuzzy
 msgid "Import"
 msgstr "Porth"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "Rhagosodedig"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Maint ffeil:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Dyfais:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Hyd cân rhagosodedig:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Diystyru'r teitlau cyffredinol"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Fformat y teitl:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Rheolwr sain"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Teitl:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD"
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Hawlfraint:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Fformat ID3:"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Addurniad"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Fformat ID3:"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 msgid "Confirm selected action"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "iawn"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 msgid "No"
 msgstr "Na"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "Ynghylch %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "Cyffredinol"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4377,6 +4556,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4390,70 +4584,70 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "Ynghylch Gyrrwr OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Rheolwr sain"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Llais"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 #, fuzzy
 msgid "Pitch"
 msgstr "Llwybr:"
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Rave"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Ffurfweddu'r Gyrrwr Sun"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Gorchymyn:"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Gorchymyn cragen i'w redeg pan fo Audacious yn newid cân."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr ""
 "Gorchymyn cragen, i'w redeg pan fo Audacious wedi cyrraedd diwedd chwarae."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Gorchymyn cragen.i'w redeg pan fo Audacious wedi cyrraedd diwedd rhestr "
 "chwarae."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4470,7 +4664,7 @@
 "%%p: Currently playing (1 or 0)"
 msgstr ""
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4478,7 +4672,7 @@
 "<span size='small'>Dylai enw ffeil a thagiau teitl cân fod o fewn dyfynodau "
 "dwb (\"). Gall peidio gwneud achosi risg diogelwch.</span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4538,7 +4732,7 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4548,15 +4742,15 @@
 "\n"
 "Gan Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "Ynghylch Ategyn Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Ffurfweddu Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Dwyster yr effaith:"
 
@@ -4592,31 +4786,31 @@
 msgid "Sun driver configuration"
 msgstr "Ffurfweddu'r Gyrrwr Sun"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "Ffurfweddiad TiMidity"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Maint y Samplo"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "Ffeil Ffurfweddiad TiMidity"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4626,12 +4820,12 @@
 "http://libtimidity.sourceforge.net\n"
 "gan Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Ategyn TiMidity %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "Meth agor dyfais ffeil MIDI"
 
@@ -4654,695 +4848,695 @@
 "frequency3;...\n"
 "e.e. tôn://2000;2005 i chwarae tôn 2000Hz a thôn 2005Hz"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Cynhyrchydd Tôn:"
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Null ategyn allbwn"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Cerdyn sain anhysbys"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Null ategyn allbwn"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "Ynghylch Ategyn Sain MPEG"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr "Tagiau ID3:"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ffurfweddiad Ogg Vorbis"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Tagiau Ogg Vorbis:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Fformat y teitl:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "Gosodiadau'r ReplayGain:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "Math ReplayGain:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "defnyddiwch Cynnydd/Brig Trac"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "defnyddio Cynnydd/Brig Albwm"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "Galluogi Chwydd 6dB a Hard Limiting"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Y Felan"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Roc Clasurol"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Gwlad"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Dance"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disgo"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Ffync"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grynge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-Hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Hen"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Roc Clasurol"
+msgid "Other"
+msgstr "Arall"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Gwlad"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Dance"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Disgo"
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Ffync"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Grynge"
+msgid "Rock"
+msgstr "Roc"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Jazz"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Metal"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "New Age"
+msgid "Techno"
+msgstr "Tecno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternative"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Hen"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Arall"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Pranks"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Trac Sain"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Roc"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Tecno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Ambient"
+msgstr "Amgylchynol"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Lleisiol"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternative"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Pranks"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Trac Sain"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Amgylchynol"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Lleisiol"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Fusion"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Trance"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Clasurôl"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Offerynnol"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Acid"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Gem"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Clip Sain"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Swn"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "AlternRock"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bas"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Gofod"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
+msgid "Meditative"
+msgstr "Meditative"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Gem"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Clip Sain"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Swn"
+msgid "Instrumental Pop"
+msgstr "Pop Offerynnol"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "AlternRock"
+msgid "Instrumental Rock"
+msgstr "Rock offerynnol"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Ethnig"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gothig"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bas"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Techno-Industrial"
+msgstr "Techno-Industrial"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Gofod"
+msgid "Electronic"
+msgstr "Electronig"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditative"
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Pop Offerynnol"
+msgid "Dream"
+msgstr "Dream"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Rock offerynnol"
+msgid "Southern Rock"
+msgstr "Southern Rock"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Ethnig"
+msgid "Comedy"
+msgstr "Comedi"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gothig"
+msgid "Cult"
+msgstr "Cult"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Techno-Industrial"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Electronig"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Dream"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Southern Rock"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Comedi"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Cult"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "40 Uchaf"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Rap Cristnogol"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Pop/Ffync"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Native American"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Cabaret"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "New Wave"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelic"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Trailer"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid Punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelic"
+msgid "Musical"
+msgstr "Musical"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
+msgid "Rock & Roll"
+msgstr "Roc a Rol"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Roc Caled"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Gwerin"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Trailer"
+msgid "Folk/Rock"
+msgstr "Gwerin/Roc"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Gwerin Cenedlaethol"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
+msgid "Bebob"
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
+msgid "Latin"
+msgstr "Lladin"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Musical"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Roc a Rol"
+msgid "Celtic"
+msgstr "Celtaidd"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Roc Caled"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Gwerin"
+msgid "Avantgarde"
+msgstr "Avantgarde"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Gwerin/Roc"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Gwerin Cenedlaethol"
+msgid "Gothic Rock"
+msgstr "Gothic Rock"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
+msgid "Progressive Rock"
+msgstr "Progressive Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+msgid "Psychedelic Rock"
+msgstr "Psychedelic Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
+msgid "Symphonic Rock"
+msgstr "Symphonic Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Lladin"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
+msgid "Slow Rock"
+msgstr "Slow Rock"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Celtaidd"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chorus"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantgarde"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Gothic Rock"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Progressive Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Psychedelic Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Symphonic Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Slow Rock"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chorus"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Acoustig"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Hiwmor"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Llais"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Chanson"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Opera"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Cerddoriaeth Siambr"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonata"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Symffoni"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Satire"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Club"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Symffoni"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folklore"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Baled"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Power Ballad"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Satire"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Club"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folklore"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Baled"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Power Ballad"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Rhythmic Soul"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Duet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Drum Solo"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "A Cappella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Drwm a Bas"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terror"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "BritPop"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Gangsta Rap Cristnogol"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Cristnogol Diweddar"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Roc Cristnogol"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5351,126 +5545,126 @@
 "Digwyddodd gwall:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Gwall!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Meth agor addasu tag (dyfais)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Meth agor addasu tag (cau)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Methu newid tag"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr "Tag Ogg Vorbis:"
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Dyddiad!"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Fersiwn:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "Rhif ISRC:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Corff:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Ogg Vorbis ReplayGain "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Cynnydd trac:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Brig trac:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Cynydd albwm:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Brig albwm:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr "Gwybodaeth am Ogg Vorbis"
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Didradd:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Graddfa samplo:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Hyd:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Maint ffeil:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "N/A"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d KBit/s (enwol)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d Bytes"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ynghylch Ategyn Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5606,11 +5800,11 @@
 msgid "General Plugin Settings:"
 msgstr "Gosodiadau'r ReplayGain:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "Ynghylch ategyn sndfile-WAV"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5651,14 +5845,31 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "Ategyn Sain WAV (sndfile)"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "Ynghylch %s"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Defnyddio rheolwr sain meddalwedd"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "Nid oes modd defnyddio ategyn Disk Writer\n"
+#~ "\n"
+#~ "pan fyddwch yn rhedeg ym modd realtime."
 
 #, fuzzy
 #~ msgid "Subtune Control"
@@ -5669,10 +5880,6 @@
 #~ msgstr "Diystyru'r teitlau cyffredinol"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Fformat y teitl:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Rheolwr sain"
 
@@ -6126,10 +6333,6 @@
 #~ msgstr "Samplo"
 
 #, fuzzy
-#~ msgid "none"
-#~ msgstr "Dim"
-
-#, fuzzy
 #~ msgid "16 bps"
 #~ msgstr "16 did"
 
--- a/po/de.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/de.po	Thu Nov 01 15:38:07 2007 +0100
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
-"PO-Revision-Date: 2007-10-05 23:23+0100\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
+"PO-Revision-Date: 2007-11-01 00:22+0100\n"
 "Last-Translator: Michael Färber <0102@gmx.at>\n"
 "Language-Team: german <0102@gmx.at>\n"
 "MIME-Version: 1.0\n"
@@ -11,11 +11,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr "Benütze libfaad2-"
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
@@ -25,67 +25,67 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 msgid "About MP4 AAC player plugin"
 msgstr "Über MP4-AAC-Player-Plugin"
 
-#: src/aac/src/libmp4.c:298
-#: src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268
-#: src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88
+#: src/aac/libmp4.c:292
+#: src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263
+#: src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77
 #: src/arts/arts.c:26
 #: src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556
-#: src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500
-#: src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552
+#: src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449
+#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137
 #: src/esd/about.c:49
-#: src/filewriter/filewriter.c:184
-#: src/jack/configure.c:140
-#: src/jack/jack.c:602
+#: src/filewriter/filewriter.c:178
+#: src/jack/configure.c:141
+#: src/jack/jack.c:539
 #: src/madplug/fileinfo.c:158
 #: src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597
-#: src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87
-#: src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231
+#: src/madplug/plugin.c:596
+#: src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88
+#: src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232
 #: src/null/null.c:67
 #: src/null/null.c:110
 #: src/OSS4/about.c:59
 #: src/OSS/about.c:54
-#: src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294
-#: src/scrobbler/gtkstuff.c:24
+#: src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300
+#: src/scrobbler/gtkstuff.c:25
 #: src/statusicon/si_ui.c:577
-#: src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119
+#: src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116
 #: src/sun/about.c:38
 #: src/sun/configure.c:559
-#: src/timidity/src/interface.c:224
-#: src/timidity/src/xmms-timidity.c:136
+#: src/timidity/interface.c:222
+#: src/timidity/xmms-timidity.c:117
 #: src/tonegen/tonegen.c:62
-#: src/tta/libtta.c:171
-#: src/tta/libtta.c:285
-#: src/tta/libtta.c:420
-#: src/vorbis/fileinfo.c:212
-#: src/vorbis/vorbis.c:880
+#: src/tta/libtta.c:151
+#: src/tta/libtta.c:265
+#: src/tta/libtta.c:400
+#: src/vorbis/fileinfo.c:209
+#: src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31
 #: src/vtx/info.c:43
 #: src/wavpack/ui.cxx:56
 #: src/wavpack/ui.cxx:554
-#: src/wav/wav-sndfile.c:566
+#: src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "OK"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "Über"
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -105,207 +105,213 @@
 "Dieses Plugin benützt die AdPlug-Bibliothek; diese ist copyright (C) Simon Peter, et al.\n"
 "Gelinkte AdPlug-Bibliotheks-Version: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 msgid "AdPlug :: Configuration"
 msgstr "AdPlug :: Konfiguration"
 
-#: src/adplug/adplug-xmms.cc:278
-#: src/alarm/interface.c:1400
-#: src/alsa/configure.c:411
+#: src/adplug/adplug-xmms.cc:273
+#: src/alarm/interface.c:1398
+#: src/alsa/configure.c:389
 #: src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561
-#: src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146
-#: src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741
-#: src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556
+#: src/audiocompress/audacious-glue.c:557
+#: src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145
+#: src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704
+#: src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237
+#: src/musepack/libmpc.cxx:557
 #: src/null/null.c:111
-#: src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192
-#: src/stereo_plugin/stereo.c:128
+#: src/sid/xmms-sid.glade:3080
+#: src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125
 #: src/sun/configure.c:567
-#: src/timidity/src/interface.c:232
+#: src/timidity/interface.c:230
 #: src/wavpack/ui.cxx:278
 #: src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/adplug/adplug-xmms.cc:294
-#: src/console/Audacious_Config.cxx:146
+#: src/adplug/adplug-xmms.cc:289
+#: src/console/Audacious_Config.cxx:145
 #: src/madplug/configure.c:191
-#: src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876
+#: src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Allgemein"
 
+#: src/adplug/adplug-xmms.cc:301
+msgid "Sound quality"
+msgstr "Sound-Qualität"
+
 #: src/adplug/adplug-xmms.cc:306
-msgid "Sound quality"
-msgstr "Sound-Qualität"
-
-#: src/adplug/adplug-xmms.cc:311
-#: src/modplug/gui/interface.cxx:151
+#: src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 msgid "8bit"
 msgstr "8 Bit"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 msgid "16bit"
 msgstr "16 Bit"
 
-#: src/adplug/adplug-xmms.cc:326
-#: src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321
+#: src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199
+#: src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Kanäle"
 
+#: src/adplug/adplug-xmms.cc:323
+#: src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157
+#: src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
+msgid "Mono"
+msgstr "Mono"
+
 #: src/adplug/adplug-xmms.cc:328
-#: src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157
-#: src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:333
 #: src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195
+#: src/modplug/gui/interface.cxx:201
+#: src/modplug/gui/modplug.glade:159
 #: src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287
-#: src/timidity/src/interface.c:175
+#: src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid "Setting stereo is not recommended, unless you need to. This won't add any stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr "Vom Gebrauch von Stereo wird abgeraten, da es dem Klang keine Stereo-Effekte hinzufügt - OPL2 ist nur Mono - aber mehr Rechenleistung benötigt!"
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr "Frequenz"
 
-#: src/adplug/adplug-xmms.cc:381
-#: src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376
+#: src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr "Liedende ermitteln"
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid "If enabled, XMMS will detect a song's ending, stop it and advance in the playlist. If disabled, XMMS won't take notice of a song's ending and loop it all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 msgid "Formats"
 msgstr "Formate"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr "Format-Auswahl"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Format"
 msgstr "Formal"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid "Selected file types will be recognized and played back by this plugin. Deselected types will be ignored to make room for other plugins to play these files."
 msgstr "Ausgewählte Dateitypen werden von diesem Plugin erkannt und abgespielt. Deaktivierte Typen werden ignoriert, dass andere Plugins diese Dateien abspielen können."
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr "AdPlug :: Dateiinformation"
 
-#: src/adplug/adplug-xmms.cc:558
+#: src/adplug/adplug-xmms.cc:553
 #: src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 msgid "Title: "
 msgstr "Titel: "
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 msgid "File Type: "
 msgstr "Dateityp: "
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
+#: src/adplug/adplug-xmms.cc:561
+msgid "Instruments: "
+msgstr "Instrumente: "
+
 #: src/adplug/adplug-xmms.cc:566
-msgid "Instruments: "
-msgstr "Instrumente: "
+msgid "Orders: "
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:567
+msgid "Patterns: "
+msgstr ""
 
 #: src/adplug/adplug-xmms.cc:571
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:572
-msgid "Patterns: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:576
 msgid "Song"
 msgstr "Titel"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 msgid "Instrument name"
 msgstr "Instrumentenname"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 msgid "Song message"
 msgstr "Titel-Meldung"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr "Reihenfolge: "
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr "Pattern: "
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr "Row: "
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 msgid "Speed: "
 msgstr "Geschwindigkeit: "
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 msgid "Timer: "
 msgstr "Timer: "
 
-#: src/adplug/adplug-xmms.cc:736
-#: src/console/Audacious_Config.cxx:226
+#: src/adplug/adplug-xmms.cc:731
+#: src/console/Audacious_Config.cxx:225
 #: src/sid/xmms-sid.glade:332
-#: src/sid/xs_interface.c:333
+#: src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 msgid "About Apple Lossless Audio Plugin"
 msgstr "Über Apple-Lossless-Audio-Plugin"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
@@ -313,15 +319,15 @@
 "Copyright (c) 2006 Audacious team\n"
 "Teile (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr "Über XMMS-Alarm"
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr "XMMS-Alarm"
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -332,51 +338,64 @@
 "\n"
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
-
-#: src/alarm/interface.c:73
-#: src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946
-#: src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+"Ein XMMS-Plugin, das verwendet werden kann,\n"
+"um zu einem bestimmten Zeitpunkt die\n"
+"Wiedergabe zu starten.\n"
+"\n"
+"Alle Beschwerden senden an:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:71
+#: src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960
+#: src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643
+#: src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Schließen"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126
-#: src/alarm/interface.c:1391
+#: src/alarm/interface.c:124
+#: src/alarm/interface.c:1389
 #: src/alsa/about.c:46
-#: src/alsa/configure.c:405
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201
-#: src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725
-#: src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43
-#: src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alsa/configure.c:383
+#: src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726
+#: src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914
+#: src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622
+#: src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44
+#: src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr "Wiedergabeliste wählen"
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr "Entschuldigung"
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds.  This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
 "\n"
@@ -386,168 +405,169 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr "Jo mei"
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 msgid "Alarm Settings"
 msgstr "Alarm-Einstellungen"
 
-#: src/alarm/interface.c:406
-#: src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404
+#: src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 msgid "Time"
 msgstr "Zeit"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 msgid "hours"
 msgstr "Stunden"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr "Uhr"
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 msgid "Quiet after:"
 msgstr "Still nach:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr "Alarm um (standardmäßig):"
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 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.c:614
-#: src/alarm/interface.c:662
-#: src/alarm/interface.c:710
-#: src/alarm/interface.c:758
-#: src/alarm/interface.c:806
-#: src/alarm/interface.c:854
-#: src/alarm/interface.c:902
+#: src/alarm/interface.c:612
+#: src/alarm/interface.c:660
+#: src/alarm/interface.c:708
+#: src/alarm/interface.c:756
+#: src/alarm/interface.c:804
+#: src/alarm/interface.c:852
+#: src/alarm/interface.c:900
 #: src/OSS4/configure.c:138
-#: src/OSS/configure.c:170
+#: src/OSS/configure.c:169
 msgid "Default"
 msgstr "Standard"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr "Tag"
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 msgid "Monday"
 msgstr "Montag"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr "Tage"
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 msgid "Fading"
 msgstr "Übergang"
 
-#: src/alarm/interface.c:1089
+#: src/alarm/interface.c:1087
 #: src/sid/xmms-sid.glade:2007
 #: src/sid/xmms-sid.glade:2178
-#: src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900
-#: src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908
+#: src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/alarm/interface.c:1097
-#: src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095
+#: src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539
+#: src/modplug/gui/modplug.glade:1113
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr "Momentan"
 
-#: src/alarm/interface.c:1130
+#: src/alarm/interface.c:1128
 msgid "reset to current output volume"
 msgstr "Zur momentanen Lautstärke zurücksetzen"
 
-#: src/alarm/interface.c:1132
+#: src/alarm/interface.c:1130
 msgid "Start at"
 msgstr "Beginnen bei"
 
-#: src/alarm/interface.c:1160
-#: src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158
+#: src/alarm/interface.c:1202
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 msgid "Final"
 msgstr "Schluss"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr "Zusätzlicher Befehl"
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 msgid "enable"
 msgstr "aktivieren"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr "Wiedergabeliste (optional)"
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr "Suchen..."
 
-#: src/alarm/interface.c:1297
-#: src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295
+#: src/alarm/interface.c:1460
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 msgid "Use reminder"
 msgstr "Erinnerung benützen"
 
-#: src/alarm/interface.c:1330
-#: src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "Options"
 msgstr "Optionen"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr "Was bedeuten diese Einstellungen?"
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -601,16 +621,64 @@
 "    type the reminder in the box and turn on the\n"
 "    toggle button if you want it to be shown.\n"
 msgstr ""
-
-#: src/alarm/interface.c:1368
+"\n"
+"Zeit\n"
+"  Alarm um: \n"
+"    Die Zeit, um die der Alarm ausgelöst wird.\n"
+"\n"
+"  Still nach: \n"
+"    Der Alarm wird nach dieser Zeit gestoppt.\n"
+"       (sofern der Aufweck-Dialog nicht geschlossen wird)\n"
+"\n"
+"\n"
+"Tage\n"
+"  Tag:\n"
+"    Die Tage wählen, an denen der Alarm aktiviert wird.\n"
+"\n"
+"  Zeit:\n"
+"    Für jeden Tag einzeln die Zeit für den Alarm wählen,\n"
+"    oder den Alarm zur Standard-Zeit aktivieren.\n"
+"\n"
+"\n"
+"Lautstärke\n"
+"  Übergang: \n"
+"    Passt die Lautstärke an die gewählte Lautstärke\n"
+"    in diesem Zeitraum an.\n"
+"\n"
+"  Beginnen bei: \n"
+"    Starte den Übergang bei dieser Lautstärke.\n"
+"\n"
+"  Schluss: \n"
+"    Die Lautstärke, bei der der Übergang stoppt.\n"
+"    Falls die Übergangszeit 0 beträgt, wird die\n"
+"    Wiedergabe schon mit dieser Lautstärke gestartet.\n"
+"\n"
+"\n"
+"Optionen:\n"
+"  Zusätzlicher Befehl:\n"
+"    Führe diesen Befehl bei Auslösung des Alarms aus.\n"
+"\n"
+"  Wiedergabeliste: \n"
+"    Lade diese Wiedergabeliste zu Wiedergabe\n"
+"    (muss die Erweiterung .m3u haben). Wenn keine Wiedergabeliste\n"
+"    gegeben ist, werden die momentan in der\n"
+"    Wiedergabeliste befindlichen Stücke verwendet.\n"
+"    Die URL eines MP3/OGG-Streams kann auch hier\n"
+"    angegeben werden, aber das Laden von Wiedergabelisten\n"
+"    von URLs wird momentan noch nicht unterstützt.\n"
+"\n"
+"  Erinnerung:\n"
+"    Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
+
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr "Die Erinnerung für heute lautet.."
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 msgid "Thankyou"
 msgstr "Danke"
 
@@ -639,62 +707,58 @@
 "Author: Matthieu Sozeau (mattam@altern.org)"
 msgstr ""
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Unbekannte Soundkarte"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Standard-PCM-Device (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "ALSA-Treiber-Konfiguration"
 
-#: src/alsa/configure.c:285
+#: src/alsa/configure.c:274
 #: src/OSS4/configure.c:186
-#: src/OSS/configure.c:218
+#: src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Audiogerät:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Mixer:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Software-Lautstärkesteuerung benützen"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Mixer-Karte:"
 
-#: src/alsa/configure.c:330
-#: src/OSS/configure.c:261
+#: src/alsa/configure.c:313
+#: src/OSS/configure.c:260
 #: src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Mixer-Gerät:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Device-Einstellungen"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Soundkarte:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Pufferzeit (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 #, fuzzy
 msgid "Period time (ms):"
 msgstr "Puffergrösse (ms):"
 
-#: src/alsa/configure.c:398
+#: src/alsa/configure.c:376
 #: src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Erweiterte Einstellungen"
@@ -1191,9 +1255,9 @@
 msgstr ""
 
 #: src/amidi-plug/i_fileinfo.c:169
-#: src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615
-#: src/vorbis/fileinfo.c:562
+#: src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684
+#: src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Name:"
 
@@ -1295,46 +1359,47 @@
 msgstr "Konkaves Rechteck"
 
 #: src/aosd/aosd_style.c:87
+#: src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Kein"
 
-#: src/aosd/aosd_trigger.c:73
+#: src/aosd/aosd_trigger.c:74
 msgid "Playback Start"
 msgstr "Wiedergabebeginn"
 
-#: src/aosd/aosd_trigger.c:74
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Löst OSD beim Abspielen eines Wiedergabelisteneintrags aus"
 
-#: src/aosd/aosd_trigger.c:78
-msgid "Title Change"
-msgstr "Titeländerung"
-
 #: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Titeländerung"
+
+#: src/aosd/aosd_trigger.c:80
 msgid "Triggers OSD when, during playback, the song title changes but the filename is the same. This is mostly useful to display title changes in internet streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 msgid "Volume Change"
 msgstr "Lautstärkeänderung"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr "Löst OSD bei Lautstärkeänderung aus"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Pause On"
 msgstr "Pause An"
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr "Löst OSD beim Pausieren der Wiedergabe aus"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Pause Off"
 msgstr "Pause Aus"
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus"
 
@@ -1412,124 +1477,126 @@
 msgid "Select Skin File"
 msgstr "Skin-Datei auswählen"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "Render-Stil"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Farben"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, c-format
 msgid "Color %i:"
 msgstr "Farbe %i:"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "Eigener Skin"
 
-#: src/aosd/aosd_ui.c:638
-msgid "Skin file:"
-msgstr "Skin-Datei:"
-
 #: src/aosd/aosd_ui.c:641
+msgid "Skin file:"
+msgstr "Skin-Datei:"
+
+#: src/aosd/aosd_ui.c:644
 #: src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706
-#: src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002
-#: src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/sid/xmms-sid.glade:2856
+#: src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010
+#: src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Auslöser aktivieren"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr "Pseudo-Transparenz"
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte Transparenz (benötigt X-Composite-Erweiterung)"
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr "Composite-Erweiterung nicht geladen"
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr "Composite-Erweiterung nicht verfügbar"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious-OSD</span>"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Audacious-OSD - Konfiguration"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: src/aosd/aosd_ui.c:1073
-#: src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876
-#: src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076
+#: src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026
+#: src/sid/xs_interface.c:1229
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "Über Audacious-OSD"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1537,7 +1604,7 @@
 "\n"
 "Audacious-OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1549,6 +1616,15 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 msgstr ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"geschrieben von Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display basiert auf der Ghosd-Bibliothek\n"
+"geschrieben von Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
 
 #: src/arts/arts.c:22
 msgid "About aRts Output"
@@ -1567,7 +1643,7 @@
 #: src/arts/configure.c:61
 #: src/esd/configure.c:171
 #: src/OSS4/configure.c:232
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:304
 #: src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Zwischenspeichern:"
@@ -1575,7 +1651,7 @@
 #: src/arts/configure.c:73
 #: src/esd/configure.c:184
 #: src/OSS4/configure.c:245
-#: src/OSS/configure.c:318
+#: src/OSS/configure.c:317
 #: src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Puffergrösse (ms):"
@@ -1583,16 +1659,16 @@
 #: src/arts/configure.c:83
 #: src/esd/configure.c:209
 #: src/OSS4/configure.c:270
-#: src/OSS/configure.c:343
+#: src/OSS/configure.c:342
 #: src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Zwischenspeichern"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1602,112 +1678,116 @@
 "keeping the volume level more or less consistent"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "Über AudioCompress"
 
+#: src/audiocompress/audacious-glue.c:320
+msgid "If checked, when the sound peaks the volume will be cut instantly; otherwise, it will ramp down just in time for the peak (but some minor clipping may still occur)."
+msgstr ""
+
 #: src/audiocompress/audacious-glue.c:324
-msgid "If checked, when the sound peaks the volume will be cut instantly; otherwise, it will ramp down just in time for the peak (but some minor clipping may still occur)."
+msgid "The maximum amount to amplify the audio by"
+msgstr ""
+
+#: src/audiocompress/audacious-glue.c:326
+msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
 #: src/audiocompress/audacious-glue.c:328
-msgid "The maximum amount to amplify the audio by"
-msgstr ""
-
-#: src/audiocompress/audacious-glue.c:330
-msgid "Defines how smoothly the volume will ramp up"
-msgstr ""
-
-#: src/audiocompress/audacious-glue.c:332
 msgid "The target audio level for ramping up. Lowering the value gives a bit more dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 msgid "AudioCompress preferences"
 msgstr "AudioCompress-Einstellungen"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 msgid "Maximum gain:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr " Chronik "
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid "How long of a history to maintain.  A higher number will make the volume changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr "Standard-Werte laden"
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 msgid "Audio values"
 msgstr "Audiowerte"
 
-#: src/audiocompress/audacious-glue.c:566
-#: src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733
-#: src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562
+#: src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698
+#: src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: src/blur_scope/blur_scope.c:57
+#: src/blur_scope/blur_scope.c:54
 msgid "/Toggle Decorations"
 msgstr "/Dekorationen umschalten"
 
-#: src/blur_scope/blur_scope.c:59
+#: src/blur_scope/blur_scope.c:56
 msgid "/-"
 msgstr "/-"
 
-#: src/blur_scope/blur_scope.c:60
+#: src/blur_scope/blur_scope.c:57
 msgid "/Close"
 msgstr "/Schliessen"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Blur-Scope"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Farbauswahl"
 
-#: src/blur_scope/config.c:83
-#: src/jack/configure.c:107
+#: src/blur_scope/config.c:82
+#: src/jack/configure.c:108
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr "CD hinzufügen"
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+msgid "About CD Audio Plugin NG"
+msgstr "Über CD-Audio-Plugin NG"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1727,11 +1807,7 @@
 "\n"
 "Das war ein Google Summer of Code 2007 Projektt."
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-msgid "About CD Audio Plugin NG"
-msgstr "Über CD-Audio-Plugin NG"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
@@ -1741,104 +1817,105 @@
 "\n"
 "Keine CD eingelegt, oder die eingelegte CD ist keine Audio-CD.\n"
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 msgid "CD Audio Plugin Configuration"
 msgstr "CD-Audio-Plugin-Konfiguration"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Digitale Audioextraktion"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 msgid "Title information"
 msgstr "Titelinformation"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr "Lesegeschwindigkeit beschränken auf: "
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr "CD-Text benutzen, falls vorhanden"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr "CDDB benutzen, falls vorhanden"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 msgid "Server: "
 msgstr "Server: "
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 msgid "Port: "
 msgstr "Port: "
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr "Anderes Device verwenden: "
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr "Debug-Informationen ausgeben"
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Konsolen-Musik-Dekoder"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/Audacious_Config.cxx:167
-#: src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166
+#: src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "sek"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Höhe:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Standard-Liedlänge:"
 
-#: src/console/Audacious_Config.cxx:201
-#: src/modplug/gui/interface.cxx:264
+#: src/console/Audacious_Config.cxx:200
+#: src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338
 #: src/sid/xmms-sid.glade:1243
-#: src/sid/xs_interface.c:645
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Resampling"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Audio-Resampling aktivieren"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Resampling-Frequenz:"
 
+#: src/console/Audacious_Config.cxx:236
+msgid "SPC"
+msgstr "SPC"
+
 #: src/console/Audacious_Config.cxx:237
-msgid "SPC"
-msgstr "SPC"
-
-#: src/console/Audacious_Config.cxx:238
 msgid "Ignore length from SPC tags"
 msgstr "Länge von SPC-Tags ignorieren"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr "Hall verstärken"
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 msgid "The default song length, expressed in seconds, is used for songs that do not provide length information (i.e. looping tracks)."
 msgstr "Die standardmäßige Liedlänge (in Sekunden) wird für Lieder benutzt, die keine Längeninformation beinhalten (z.B. Lieder in der Endlosschleife)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "Über den Konsolen-Musik-Dekoder"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -1850,7 +1927,7 @@
 "Implementierung für Audacious von: William Pitcock <nenolod@nenolod.net>, \n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -1858,27 +1935,27 @@
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "Über Echo-Plugin"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Echo-Plugin konfigurieren"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Verzögerung: (ms)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Rückkoppelung: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Lautstärke: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Surround-Echo"
 
@@ -1933,7 +2010,7 @@
 
 #: src/esd/configure.c:198
 #: src/OSS4/configure.c:259
-#: src/OSS/configure.c:332
+#: src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr ""
@@ -2088,8 +2165,7 @@
 msgstr ""
 
 #: src/evdev-plug/ed_ui.c:318
-#: src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Fehler"
 
@@ -2207,11 +2283,11 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 msgid "About FileWriter-Plugin"
 msgstr "Über FileWriter-Plugin"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2231,62 +2307,56 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:199
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr "Benutzung des FileWriter-Plugins im Realtime-Modus nicht möglich."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 msgid "File Writer Configuration"
 msgstr "FileWriter-Konfiguration"
 
+#: src/filewriter/filewriter.c:488
+msgid "Output file format:"
+msgstr "Ausgabedatei-Format:"
+
+#: src/filewriter/filewriter.c:506
+#: src/ladspa/ladspa.c:960
+msgid "Configure"
+msgstr "Konfigurieren"
+
+#: src/filewriter/filewriter.c:521
+msgid "Save into original directory"
+msgstr "In Original-Verzeichnis speichern"
+
 #: src/filewriter/filewriter.c:526
-msgid "Output file format:"
-msgstr "Ausgabedatei-Format:"
-
-#: src/filewriter/filewriter.c:544
-#: src/ladspa/ladspa.c:962
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: src/filewriter/filewriter.c:559
-msgid "Save into original directory"
-msgstr "In Original-Verzeichnis speichern"
-
-#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr "In anderes Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Ausgabedatei-Verzeichnis:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr "Verzeichnis wählen"
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr "Dateiname erhalten von:"
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr "ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr "ürsprünglichen Dateinamen"
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Dateiendung nicht entfernen"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid "If enabled, the extension from the original filename will not be stripped before adding the new file extension to the end."
 msgstr "Wenn aktiviert, wird die Erweiterung des ursprünglichen Dateinamens nicht entfernt, bevor die neue Dateierweiterung am Ende angefügt wird."
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr "Track-Nummer vor Dateinamen anhängen"
 
@@ -2364,8 +2434,9 @@
 msgstr "16-Bit-Prüfsumme zu jedem Frame hinzufügen"
 
 #: src/filewriter/mp3.c:981
-#: src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309
+#: src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr "Qualität"
 
@@ -2467,19 +2538,19 @@
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-Encoder-Konfiguration"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr "Qualitätsstufe (0 - 10):"
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 msgid "FLAC Audio Plugin "
 msgstr "FLAC-Audio-Plugin "
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2495,31 +2566,165 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 msgid "About FLAC Audio Plugin"
 msgstr "Über FLAC-Audio-Plugin"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+msgid "About Gnome Shortcut Plugin"
+msgstr "Über das Gnome-Shortcut-Plugin"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+"Gnome-Shortcut-Plugin\n"
+"Ermöglicht die Kontrolle des Players mit den Tastaturkürzeln von GNOME.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+
+#: src/hotkey/plugin.c:607
+msgid "(none)"
+msgstr "(keine)"
+
+#: src/hotkey/plugin.c:752
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Global-Hotkey-Konfiguration"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr "Tastenkombination innerhalb eines Textfelds drücken."
+
+#: src/hotkey/plugin.c:773
+msgid "<b>Playback:</b>"
+msgstr "<b>Wiedergabe:</b>"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr "<i>Tasten konfigurieren, die die Wiedergabe von Audacious kontrollieren.</i>"
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr "Voriger Titel:"
+
+#: src/hotkey/plugin.c:798
+msgid "Play/Pause:"
+msgstr "Wiedergabe starten/pausieren"
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr "Pause:"
+
+#: src/hotkey/plugin.c:804
+msgid "Stop:"
+msgstr "Stop:"
+
+#: src/hotkey/plugin.c:807
+msgid "Next Track:"
+msgstr "Nächster Titel:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr "5 Sek. vorspulen:"
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr "5 Sek. zurückspulen:"
+
+#: src/hotkey/plugin.c:818
+msgid "<b>Volume Control:</b>"
+msgstr "<b>Lautstärkeregelung:</b>"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr "<i>Tasten konfigurieren, die die Musiklautstärke kontrollieren.</i>"
+
+#: src/hotkey/plugin.c:841
+msgid "Mute:"
+msgstr "Stumm:"
+
+#: src/hotkey/plugin.c:844
+msgid "Volume Up:"
+msgstr "Lautstärke erhöhen:"
+
+#: src/hotkey/plugin.c:847
+msgid "Volume Down:"
+msgstr "Lautstärke verringern:"
+
+#: src/hotkey/plugin.c:852
+msgid "<b>Player:</b>"
+msgstr "<b>Player:</b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr "<i>Tasten konfigurieren, die den Player kontrollieren.</i>"
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr "Zu Datei springen:"
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr "Player zeigen/verstecken:"
+
+#: src/hotkey/plugin.c:903
+msgid "About Global Hotkey Plugin"
+msgstr "Über das Global-Hotkeys-Plugin"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+"Global-Hotkey-Plugin\n"
+"Den Player mit globalen Tastenkombinationen oder Multimedia-Tasten bedienen.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Mitwirkende:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 msgid "jack Plugin configuration"
 msgstr "jack-Plugin-Konfiguration"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 msgid "Enable debug printing"
 msgstr ""
 
@@ -2542,15 +2747,15 @@
 msgstr ""
 
 #: src/jack/jack.c:118
-#: src/wma/wma.c:156
+#: src/wma/wma.c:157
 msgid " Close "
 msgstr " Schliessen"
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2561,38 +2766,38 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:769
-#: src/ladspa/ladspa.c:855
+msgstr "Dieses LADSPA-Plugin hat keine Benutzeroberfläche."
+
+#: src/ladspa/ladspa.c:767
+#: src/ladspa/ladspa.c:853
 msgid "Name"
 msgstr "Name"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr "UID"
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr "Installierte Plugins"
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:954
+msgstr "Aktive Plugins"
+
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
-msgstr ""
+msgstr "LADSPA-Plugin-Liste"
 
 #: src/lastfm/lastfm.c:96
 msgid ""
@@ -2601,15 +2806,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "Über das LIRC-Audacious-Plugin"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "LIRC-Plugin "
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "LIRC-Plugin "
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2633,12 +2838,12 @@
 "Informationen zu LIRC sind verfügbar bei:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: Konnte LIRC-Unterstützung nicht initialisieren\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2646,12 +2851,12 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
@@ -2689,9 +2894,8 @@
 msgstr "ReplayGain-Bearbeitung aktivieren"
 
 #: src/madplug/configure.c:201
-#, fuzzy
 msgid "Track mode"
-msgstr "Titelnummer:"
+msgstr "Track-Modus:"
 
 #: src/madplug/configure.c:208
 msgid "6dB hard limiting"
@@ -2706,14 +2910,14 @@
 msgstr "Vorverstärkung (dB):"
 
 #: src/madplug/configure.c:233
-#: src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221
+#: src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219
 #: src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "ReplayGain"
 
 #: src/madplug/configure.c:238
-#: src/vorbis/configure.c:137
+#: src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Allgemeine Titel überschreiben"
 
@@ -2722,7 +2926,9 @@
 msgstr "ID3-Format:"
 
 #: src/madplug/configure.c:261
-#: src/vorbis/configure.c:160
+#: src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070
+#: src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Titel"
 
@@ -2752,55 +2958,55 @@
 msgstr "ID3-Tag"
 
 #: src/madplug/fileinfo.c:425
-#: src/musepack/libmpc.cxx:513
-#: src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585
+#: src/musepack/libmpc.cxx:514
+#: src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582
 #: src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Titel:"
 
 #: src/madplug/fileinfo.c:435
-#: src/musepack/libmpc.cxx:517
-#: src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596
+#: src/musepack/libmpc.cxx:518
+#: src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593
 #: src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Künstler:"
 
 #: src/madplug/fileinfo.c:445
-#: src/musepack/libmpc.cxx:521
-#: src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607
+#: src/musepack/libmpc.cxx:522
+#: src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604
 #: src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Album:"
 
 #: src/madplug/fileinfo.c:455
-#: src/musepack/libmpc.cxx:525
-#: src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618
+#: src/musepack/libmpc.cxx:526
+#: src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615
 #: src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #: src/madplug/fileinfo.c:465
-#: src/musepack/libmpc.cxx:529
-#: src/tta/libtta.c:384
+#: src/musepack/libmpc.cxx:530
+#: src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr "Jahr:"
 
 #: src/madplug/fileinfo.c:476
-#: src/tta/libtta.c:396
-#: src/vorbis/fileinfo.c:641
+#: src/tta/libtta.c:376
+#: src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Titelnummer:"
 
 #: src/madplug/fileinfo.c:487
-#: src/musepack/libmpc.cxx:539
-#: src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653
+#: src/musepack/libmpc.cxx:540
+#: src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650
 #: src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Genre:"
@@ -2810,8 +3016,8 @@
 msgstr "Unbekannt"
 
 #: src/madplug/fileinfo.c:620
-#: src/musepack/libmpc.cxx:633
-#: src/tta/libtta.c:431
+#: src/musepack/libmpc.cxx:634
+#: src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -2828,7 +3034,7 @@
 msgstr ""
 
 #: src/madplug/fileinfo.c:660
-#: src/vorbis/fileinfo.c:962
+#: src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -2873,7 +3079,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -2904,15 +3110,15 @@
 "ReplayGain-Unterstützung von:\n"
 "    Samuel Krempp"
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 msgid "About MPEG Audio Plugin"
 msgstr "Über MPEG-Audio-Plugin"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid "About Metronom"
 msgstr "Über Metronom"
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2926,165 +3132,203 @@
 "z.B. tact://77 zum Spielen von 77 Schlägen pro Minute\n"
 "oder tact://60*3/4 zum Spielen von 60 bpm im 3/4-Takt"
 
-#: src/metronom/metronom.c:199
-#: src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198
+#: src/metronom/metronom.c:262
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d bpm"
 
-#: src/metronom/metronom.c:201
-#: src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200
+#: src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133
+#: src/modplug/gui/modplug.glade:9
 msgid "ModPlug Configuration"
 msgstr "ModPlug-Konfiguration"
 
-#: src/modplug/gui/interface.cxx:165
-#: src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170
+#: src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bit"
 
-#: src/modplug/gui/interface.cxx:173
-#: src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177
+#: src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208
+#: src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr "Mono (downmix)"
 
-#: src/modplug/gui/interface.cxx:218
-#: src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Abtastfrequenz"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237
+#: src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr "Am nähesten (schnellstes)"
+
+#: src/modplug/gui/interface.cxx:244
+#: src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr "Linear (schnell)"
+
+#: src/modplug/gui/interface.cxx:251
+#: src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr "Spline (gute Qualität)"
+
+#: src/modplug/gui/interface.cxx:258
+#: src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr "8-tap Fir (extrem hohe Qualität)"
+
+#: src/modplug/gui/interface.cxx:282
+#: src/modplug/gui/modplug.glade:384
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289
+#: src/modplug/gui/modplug.glade:403
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296
+#: src/modplug/gui/modplug.glade:423
 msgid "11 kHz"
 msgstr "11 kHz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr "Am nähesten (schnellstes)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr "Linear (schnell)"
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr "Spline (gute Qualität)"
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (extrem hohe Qualität)"
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr "Dateinamen als Liedtitel verwenden"
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr "Schnelle Wiedergabenliste-Information"
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr "Geräuschreduktion"
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD abspielen"
-
-#: src/modplug/gui/interface.cxx:384
+#: src/modplug/gui/interface.cxx:304
+#: src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Abtastfrequenz"
+
+#: src/modplug/gui/interface.cxx:338
+#: src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466
+#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540
+#: src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910
+#: src/modplug/gui/modplug.glade:1089
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: src/modplug/gui/interface.cxx:367
+#: src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607
+#: src/modplug/gui/modplug.glade:977
+msgid "Depth"
+msgstr "Tiefe"
+
+#: src/modplug/gui/interface.cxx:375
+#: src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635
+#: src/modplug/gui/modplug.glade:1005
+msgid "Delay"
+msgstr "Verzögerung"
+
+#: src/modplug/gui/interface.cxx:383
+#: src/modplug/gui/modplug.glade:672
 msgid "Reverb"
 msgstr "Hall"
 
-#: src/modplug/gui/interface.cxx:398
-#: src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542
-#: src/modplug/gui/interface.cxx:628
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: src/modplug/gui/interface.cxx:438
-#: src/modplug/gui/interface.cxx:582
-msgid "Depth"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:447
-#: src/modplug/gui/interface.cxx:591
-msgid "Delay"
-msgstr "Verzögerung"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:429
+#: src/modplug/gui/modplug.glade:786
 msgid "Amount"
 msgstr "Menge"
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437
+#: src/modplug/gui/modplug.glade:814
 msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:528
+msgstr "Bereich"
+
+#: src/modplug/gui/interface.cxx:445
+#: src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr "Bassverstärkung"
+
+#: src/modplug/gui/interface.cxx:511
+#: src/modplug/gui/modplug.glade:1042
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550
+#: src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+"Bemerkung: Eine zu hohe Vorverstärkung kann\n"
+"Clipping verursachen (störende Geräusche)!"
+
+#: src/modplug/gui/interface.cxx:556
+#: src/modplug/gui/modplug.glade:1192
 msgid "Preamp"
 msgstr "Vorverstärkung"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr "Loopen"
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561
+#: src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr "Effekte"
+
+#: src/modplug/gui/interface.cxx:590
+#: src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr "Dateinamen als Liedtitel verwenden"
+
+#: src/modplug/gui/interface.cxx:595
+#: src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr "Schnelle Wiedergabenliste-Information"
+
+#: src/modplug/gui/interface.cxx:606
+#: src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr "Geräuschreduktion"
+
+#: src/modplug/gui/interface.cxx:612
+#: src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr "Amiga MOD abspielen"
+
+#: src/modplug/gui/interface.cxx:635
+#: src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr "Nicht loopen"
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647
+#: src/modplug/gui/modplug.glade:1455
 msgid "Loop"
-msgstr "Loop"
-
-#: src/modplug/gui/interface.cxx:694
+msgstr "Loope"
+
+#: src/modplug/gui/interface.cxx:660
+#: src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:701
+msgstr "Mal"
+
+#: src/modplug/gui/interface.cxx:666
+#: src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr "Für immer loopen"
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr "Effekte"
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673
+#: src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr "Loopen"
+
+#: src/modplug/gui/interface.cxx:847
+#: src/modplug/gui/modplug.glade:1668
 msgid "MOD Info"
 msgstr "MOD-Information"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3108,23 +3352,41 @@
 "Patterns:\n"
 "Kanäle:"
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871
+#: src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901
+#: src/modplug/gui/modplug.glade:1849
 msgid "Samples"
 msgstr "Samples"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926
+#: src/modplug/gui/modplug.glade:1914
 msgid "Instruments"
 msgstr "Instrumente"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947
+#: src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr "Meldung"
 
-#: src/modplug/gui/main.cxx:43
+#: src/modplug/gui/main.cxx:44
 msgid "Modplug Input Plugin for Audacious ver"
 msgstr "Modplug-Input-Plugin für Audacious Version"
 
-#: src/modplug/gui/main.cxx:44
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3140,27 +3402,23 @@
 "Updates und Betreunung von Konstanty Bialkowski.\n"
 "Portiert für BMP von Theofilos Intzoglou."
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 msgid "About Modplug"
 msgstr "Über Modplug"
 
-#: src/modplug/gui/support.cxx:118
+#: src/modplug/gui/support.cxx:88
+#: src/modplug/gui/support.cxx:112
 #: src/sid/xs_glade.c:90
 #: src/sid/xs_glade.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Konnte Pixmap-Datei nicht finden: %s"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "Fehler beim Laden der Pixmap-Datei: %s"
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr "Musepack-Dekoder-Plugin 1.2"
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3176,144 +3434,144 @@
 "\n"
 "Die neueste Version ist erhältlich auf http://musepack.net\n"
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr "Vergiss es"
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 msgid "Musepack Decoder Configuration"
 msgstr "Musepack-DekoderKonfiguration"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: src/musepack/libmpc.cxx:182
+#: src/musepack/libmpc.cxx:183
 #: src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr "Dynamische-Bitraten-Anzeige aktivieren"
 
-#: src/musepack/libmpc.cxx:186
+#: src/musepack/libmpc.cxx:187
 #: src/wavpack/ui.cxx:496
 msgid "Plugin"
 msgstr "Plugin"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 msgid "ReplayGain Settings"
 msgstr "ReplayGain-Einstellungen"
 
-#: src/musepack/libmpc.cxx:196
-#: src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197
+#: src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Clipping-Verhinderung aktivieren"
 
-#: src/musepack/libmpc.cxx:201
-#: src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202
+#: src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "ReplayGain aktivieren"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 msgid "ReplayGain Type"
 msgstr "ReplayGain-Typ"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 msgid "Use Track Gain"
 msgstr "Track Gain benutzen"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 msgid "Use Album Gain"
 msgstr "Album Gain benutzen"
 
-#: src/musepack/libmpc.cxx:490
-#: src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495
-#: src/tta/libtta.c:322
+#: src/musepack/libmpc.cxx:491
+#: src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564
+#: src/tta/libtta.c:302
 #: src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 msgid "Track:"
 msgstr "Titel:"
 
-#: src/musepack/libmpc.cxx:550
+#: src/musepack/libmpc.cxx:551
 #: src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812
+#: src/sid/xs_interface.c:820
 #: src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Speichern"
 
-#: src/musepack/libmpc.cxx:553
+#: src/musepack/libmpc.cxx:554
 #: src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "Tag entfernen"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, c-format
 msgid "Streamversion %d"
 msgstr "Streamversion %d"
 
-#: src/musepack/libmpc.cxx:595
+#: src/musepack/libmpc.cxx:596
 #, c-format
 msgid "Encoder: %s"
 msgstr "Enkoder: %s"
 
-#: src/musepack/libmpc.cxx:596
+#: src/musepack/libmpc.cxx:597
 #, c-format
 msgid "Profile: %s"
 msgstr "Profil: %s"
 
-#: src/musepack/libmpc.cxx:597
+#: src/musepack/libmpc.cxx:598
 #, c-format
 msgid "Average bitrate: %6.1f kbps"
 msgstr "Durchschnittliche bitrate: %6.1f kbps"
 
-#: src/musepack/libmpc.cxx:598
+#: src/musepack/libmpc.cxx:599
 #, c-format
 msgid "Samplerate: %d Hz"
 msgstr "Abtastfrequenz: %d Hz"
 
-#: src/musepack/libmpc.cxx:599
+#: src/musepack/libmpc.cxx:600
 #, c-format
 msgid "Channels: %d"
 msgstr "Kanäle: %d"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, c-format
 msgid "Length: %d:\\%.2d"
 msgstr "Länge: %d:\\%.2d"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, c-format
 msgid "File size: %d Bytes"
 msgstr "Dateigröße: %d Byte"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, c-format
 msgid "Track Peak: %5u"
 msgstr "Track Peak: %5u"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Track Gain: %-+2.2f dB"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, c-format
 msgid "Album Peak: %5u"
 msgstr "Album Peak: %5u"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Album Gain: %-+5.2f dB"
@@ -3370,30 +3628,30 @@
 msgstr ""
 
 #: src/OSS4/configure.c:120
-#: src/OSS/configure.c:152
+#: src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Standard (%s)"
 
 #: src/OSS4/configure.c:170
-#: src/OSS/configure.c:202
+#: src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "OSS-Treiber-Konfiguration"
 
 #: src/OSS4/configure.c:208
-#: src/OSS/configure.c:240
-#: src/OSS/configure.c:281
+#: src/OSS/configure.c:239
+#: src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Alternatives Gerät benutzen:"
 
 #: src/OSS4/configure.c:230
-#: src/OSS/configure.c:303
+#: src/OSS/configure.c:302
 #: src/sun/configure.c:248
 msgid "Devices"
 msgstr "Geräte"
 
 #: src/OSS4/configure.c:272
-#: src/OSS/configure.c:344
+#: src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Mixer-Einstellungen:"
 
@@ -3402,7 +3660,7 @@
 msgstr ""
 
 #: src/OSS4/configure.c:284
-#: src/OSS/configure.c:356
+#: src/OSS/configure.c:355
 #: src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Mixer"
@@ -3431,15 +3689,15 @@
 "USA."
 msgstr ""
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Über Audacious-PulseAudio-Ausgabe-Plugin"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3459,40 +3717,43 @@
 "USA."
 msgstr ""
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Dienste</b>"
 
-#: src/scrobbler/configure.c:122
-#: src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121
+#: src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/scrobbler/configure.c:128
-#: src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127
+#: src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
 msgstr ""
-
-#: src/scrobbler/gtkstuff.c:22
+"Audacious AudioScrobbler-Plugin\n"
+"\n"
+"Ursprünglich erstellt von Audun Hove <audun@nlc.no> und Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "Über Scrobbler-Plugin"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3502,7 +3763,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 msgid "Scrobbler Error"
 msgstr "Scrobbler-Fehler"
 
@@ -3514,603 +3775,649 @@
 msgid "Error initializing STIL database!\n"
 msgstr "Fehler beim Initialisieren der STIL-Datenbank!\n"
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr "Konnte keinen Speicher für den Audio-Daten-Buffer allozieren!\n"
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr "Konnte keinen Speicher für den Audio-Oversampling-Buffer allozieren!\n"
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr "Konnte SID-Tune '%s' (Unter-Tune #%i) nicht initialisieren!\n"
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:8
-#: src/sid/xs_interface.c:213
+#: src/sid/xs_interface.c:221
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID-Konfiguration"
 
 #: src/sid/xmms-sid.glade:71
-#: src/sid/xs_interface.c:249
+#: src/sid/xs_interface.c:257
 msgid "8-bit"
 msgstr "8 Bit"
 
 #: src/sid/xmms-sid.glade:90
-#: src/sid/xs_interface.c:256
+#: src/sid/xs_interface.c:264
 msgid "16-bit"
 msgstr "16 Bit"
 
 #: src/sid/xmms-sid.glade:111
-#: src/sid/xs_interface.c:263
+#: src/sid/xs_interface.c:271
 msgid "Resolution:"
 msgstr "Auflösung:"
 
 #: src/sid/xmms-sid.glade:196
-#: src/sid/xs_interface.c:294
+#: src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:217
-#: src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867
-#: src/vorbis/fileinfo.c:924
+#: src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864
+#: src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Kanäle:"
 
 #: src/sid/xmms-sid.glade:384
-#: src/sid/xs_interface.c:345
+#: src/sid/xs_interface.c:353
 msgid "Samplerate:"
 msgstr "Abtastfrequenz:"
 
 #: src/sid/xmms-sid.glade:430
-#: src/sid/xs_interface.c:362
+#: src/sid/xs_interface.c:370
 msgid "Use oversampling"
 msgstr "Oversampling benützen"
 
 #: src/sid/xmms-sid.glade:456
-#: src/sid/xs_interface.c:373
+#: src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr "Faktor:"
 
 #: src/sid/xmms-sid.glade:500
-#: src/sid/xs_interface.c:385
+#: src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr "Große Faktoren benötigen mehr Rechenleistung"
 
 #: src/sid/xmms-sid.glade:534
-#: src/sid/xs_interface.c:391
+#: src/sid/xs_interface.c:399
 msgid "Oversampling:"
 msgstr "Oversampling:"
 
 #: src/sid/xmms-sid.glade:570
-#: src/sid/xs_interface.c:396
+#: src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr "Audio"
 
 #: src/sid/xmms-sid.glade:620
-#: src/sid/xs_interface.c:428
+#: src/sid/xs_interface.c:436
 msgid "If enabled, this option \"forces\" the emulation engine to use the selected clock speed/frequency. Otherwise the speed is determined from played file itself."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:622
-#: src/sid/xs_interface.c:424
+#: src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr "Geschwindigkeit erzwingen"
 
 #: src/sid/xmms-sid.glade:640
-#: src/sid/xs_interface.c:434
+#: src/sid/xs_interface.c:442
 msgid "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:642
-#: src/sid/xs_interface.c:430
+#: src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr "PAL (50 Hz)"
 
 #: src/sid/xmms-sid.glade:660
-#: src/sid/xs_interface.c:442
+#: src/sid/xs_interface.c:450
 msgid "NTSC is the TV standard with 60Hz vertical refresh rate (and other features that differ from PAL). It is mainly used in United States, Japan and certain other countries."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:662
-#: src/sid/xs_interface.c:438
+#: src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr "NTSC (60 Hz)"
 
 #: src/sid/xmms-sid.glade:683
-#: src/sid/xs_interface.c:446
+#: src/sid/xs_interface.c:454
 msgid "Clock speed:"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:728
-#: src/sid/xs_interface.c:467
+#: src/sid/xs_interface.c:475
 msgid "If enabled, this option \"forces\" the emulation engine to use the selected SID-chip model. Otherwise the preferred SID model is determined from the file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:730
-#: src/sid/xs_interface.c:463
+#: src/sid/xs_interface.c:471
 msgid "Force model"
 msgstr "Modell erzwingen"
 
 #: src/sid/xmms-sid.glade:748
-#: src/sid/xs_interface.c:473
+#: src/sid/xs_interface.c:481
 msgid "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 in few ways, having much fuller filter (which, due to design error, is never same between two different SID-chips) and has the \"volume adjustment bug\", which enables playing of digital samples."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:750
-#: src/sid/xs_interface.c:469
+#: src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr "MOS 6581"
 
 #: src/sid/xmms-sid.glade:769
-#: src/sid/xs_interface.c:477
+#: src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr "MOS 8580"
 
 #: src/sid/xmms-sid.glade:790
-#: src/sid/xs_interface.c:484
+#: src/sid/xs_interface.c:492
 msgid "SID model:"
 msgstr "SID-Modell:"
 
 #: src/sid/xmms-sid.glade:842
-#: src/sid/xs_interface.c:505
+#: src/sid/xs_interface.c:513
 msgid "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:844
-#: src/sid/xs_interface.c:501
+#: src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:863
-#: src/sid/xs_interface.c:513
+#: src/sid/xs_interface.c:521
 msgid "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:865
-#: src/sid/xs_interface.c:509
+#: src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr "SIDPlay 2 (zyklus-basiert)"
 
 #: src/sid/xmms-sid.glade:887
-#: src/sid/xs_interface.c:517
+#: src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr "Auswahl der Emulations-Bibliothek:"
 
 #: src/sid/xmms-sid.glade:933
-#: src/sid/xs_interface.c:534
+#: src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr "Echter C64 (nur SIDPlay 2)"
 
 #: src/sid/xmms-sid.glade:952
-#: src/sid/xs_interface.c:541
+#: src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:972
-#: src/sid/xs_interface.c:548
+#: src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:992
-#: src/sid/xs_interface.c:555
+#: src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr "PlaySID-Umgebung"
 
 #: src/sid/xmms-sid.glade:1013
-#: src/sid/xs_interface.c:562
+#: src/sid/xs_interface.c:570
 msgid "Memory mode:"
 msgstr "Speichermodus:"
 
 #: src/sid/xmms-sid.glade:1049
-#: src/sid/xs_interface.c:567
+#: src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1093
-#: src/sid/xs_interface.c:594
+#: src/sid/xs_interface.c:602
 msgid "This setting can be used to enable libSIDPlay2's \"optimization mode\", which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1095
-#: src/sid/xs_interface.c:590
+#: src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr "Optimierungs-Modus (schneller, ungenau)"
 
 #: src/sid/xmms-sid.glade:1113
-#: src/sid/xs_interface.c:600
+#: src/sid/xs_interface.c:608
 msgid "reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1115
-#: src/sid/xs_interface.c:596
+#: src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr "reSID-Emulation"
 
 #: src/sid/xmms-sid.glade:1133
-#: src/sid/xs_interface.c:608
+#: src/sid/xs_interface.c:616
 msgid "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve \"near 100%\" similarity to real C64. For more information, see http://www.hardsid.com/"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1135
-#: src/sid/xs_interface.c:604
+#: src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr "HardSID"
 
 #: src/sid/xmms-sid.glade:1156
-#: src/sid/xs_interface.c:612
+#: src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr "SIDPlay 2-Optionen:"
 
 #: src/sid/xmms-sid.glade:1201
-#: src/sid/xs_interface.c:633
+#: src/sid/xs_interface.c:641
 msgid "Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1203
-#: src/sid/xs_interface.c:629
+#: src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1221
-#: src/sid/xs_interface.c:641
+#: src/sid/xs_interface.c:649
 msgid "Uses linear interpolation between samples, yielding higher audio quality with less sampling noise."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1223
-#: src/sid/xs_interface.c:637
+#: src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr "Lineare Interpolation"
 
 #: src/sid/xmms-sid.glade:1263
-#: src/sid/xs_interface.c:652
+#: src/sid/xs_interface.c:660
 msgid "Resampling (FIR)"
 msgstr "Resampling (FIR)"
 
 #: src/sid/xmms-sid.glade:1284
-#: src/sid/xs_interface.c:659
+#: src/sid/xs_interface.c:667
 msgid "reSID sampling options:"
 msgstr "reSID-Sampling-Optionen:"
 
 #: src/sid/xmms-sid.glade:1320
-#: src/sid/xs_interface.c:664
+#: src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1350
-#: src/sid/xs_interface.c:680
+#: src/sid/xs_interface.c:688
 msgid "This option enables emulation of SID filter. The filter is an essential part of SID's sound capacity, but accurate emulation of it may require quite much CPU power. However, if filter emulation is disabled, tunes won't sound authentic at all if they utilize the filter."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1352
-#: src/sid/xs_interface.c:676
+#: src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr "Filter emulieren"
 
 #: src/sid/xmms-sid.glade:1409
-#: src/sid/xs_interface.c:705
+#: src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1460
-#: src/sid/xs_interface.c:722
+#: src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1511
-#: src/sid/xs_interface.c:739
+#: src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1549
-#: src/sid/xs_interface.c:750
+#: src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr "Werte zurücksetzen"
 
 #: src/sid/xmms-sid.glade:1578
-#: src/sid/xs_interface.c:755
+#: src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr "SIDPlay1"
 
 #: src/sid/xmms-sid.glade:1690
-#: src/sid/xs_interface.c:796
+#: src/sid/xs_interface.c:804
 msgid "Export"
 msgstr "Exportieren"
 
 #: src/sid/xmms-sid.glade:1711
-#: src/sid/xs_interface.c:804
+#: src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1753
-#: src/sid/xs_interface.c:820
+#: src/sid/xs_interface.c:828
 msgid "Import"
 msgstr "Importieren"
 
 #: src/sid/xmms-sid.glade:1774
-#: src/sid/xs_interface.c:828
+#: src/sid/xs_interface.c:836
 msgid "Delete"
 msgstr "Löschen"
 
 #: src/sid/xmms-sid.glade:1819
-#: src/sid/xs_interface.c:842
+#: src/sid/xs_interface.c:850
 msgid "Filter curve:"
 msgstr "Filterkurve:"
 
 #: src/sid/xmms-sid.glade:1855
-#: src/sid/xs_interface.c:847
+#: src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr "SIDPlay2"
 
 #: src/sid/xmms-sid.glade:1891
-#: src/sid/xs_interface.c:853
+#: src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr "Filter"
 
 #: src/sid/xmms-sid.glade:1935
-#: src/sid/xs_interface.c:880
+#: src/sid/xs_interface.c:888
 msgid "If enabled, the tune is played at least for the specified time, adding silence to the end if necessary."
 msgstr "Wenn aktiviert, wird das Stück mindestens für die angegebene Zeit abgespielt, wobei nötigenfalls Stille zum Ende hinzugefügt wird."
 
 #: src/sid/xmms-sid.glade:1937
-#: src/sid/xs_interface.c:876
+#: src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr "Mindestens für die angegebene Zeit spielen"
 
 #: src/sid/xmms-sid.glade:1962
 #: src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482
-#: src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941
-#: src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632
+#: src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949
+#: src/sid/xs_interface.c:1109
 msgid "Playtime:"
 msgstr "Spielzeit:"
 
 #: src/sid/xmms-sid.glade:2041
-#: src/sid/xs_interface.c:907
+#: src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr "Minimale Spielzeit:"
 
 #: src/sid/xmms-sid.glade:2086
-#: src/sid/xs_interface.c:928
+#: src/sid/xs_interface.c:936
 msgid "If enabled, tune is played until specified duration is reached (aka maximum playtime)."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2088
-#: src/sid/xs_interface.c:924
+#: src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2107
-#: src/sid/xs_interface.c:934
+#: src/sid/xs_interface.c:942
 msgid "If enabled, the maximum playtime is applied only if song/tune length is not known."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2109
-#: src/sid/xs_interface.c:930
+#: src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2212
-#: src/sid/xs_interface.c:961
+#: src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr "Maximale Spielzeit:"
 
 #: src/sid/xmms-sid.glade:2257
-#: src/sid/xs_interface.c:982
+#: src/sid/xs_interface.c:990
 msgid "This option enables using of XSIDPLAY compatible song length database. (Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2259
-#: src/sid/xs_interface.c:978
+#: src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr "XSIDPLAY-kompatible Datenbank benützen"
 
 #: src/sid/xmms-sid.glade:2284
-#: src/sid/xs_interface.c:989
+#: src/sid/xs_interface.c:997
 msgid "DB-file:"
 msgstr "DB-Datei:"
 
 #: src/sid/xmms-sid.glade:2309
-#: src/sid/xs_interface.c:999
+#: src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr "Datenbankpfad und -dateiname"
 
 #: src/sid/xmms-sid.glade:2329
-#: src/sid/xs_interface.c:1006
+#: src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2356
-#: src/sid/xs_interface.c:1008
+#: src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2392
-#: src/sid/xs_interface.c:1013
+#: src/sid/xs_interface.c:1021
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2437
-#: src/sid/xs_interface.c:1036
-msgid "Add sub-tunes to playlist"
-msgstr ""
+#: src/sid/xmms-sid.glade:2430
+#: src/sid/xs_interface.c:1043
+msgid "By enabling this option you can specify a custom Tuplez formatting string for SID-files. The SID-plugin specific Tuplez tags are described shortly below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432
+#: src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Allgemeine Titel überschreiben"
 
 #: src/sid/xmms-sid.glade:2457
-#: src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560
-#: src/sid/xs_interface.c:1071
+#: src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477
+#: src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511
+#: src/sid/xs_interface.c:1065
 #, fuzzy
-msgid "Sub-tune handling:"
-msgstr "Lautstärkesteuerung:"
+msgid "Song title format:"
+msgstr "Titelformat:"
+
+#: src/sid/xmms-sid.glade:2584
+#: src/sid/xs_interface.c:1096
+msgid "If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586
+#: src/sid/xs_interface.c:1092
+msgid "Add sub-tunes to playlist"
+msgstr ""
 
 #: src/sid/xmms-sid.glade:2605
-#: src/sid/xs_interface.c:1092
-msgid "If this option is enabled (and the database & HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played."
+#: src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
 msgstr ""
 
 #: src/sid/xmms-sid.glade:2607
-#: src/sid/xs_interface.c:1088
+#: src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710
+#: src/sid/xs_interface.c:1129
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Lautstärkesteuerung:"
+
+#: src/sid/xmms-sid.glade:2755
+#: src/sid/xs_interface.c:1150
+msgid "If this option is enabled (and the database & HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2757
+#: src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr "STIL-Datenbank verwenden"
 
-#: src/sid/xmms-sid.glade:2632
-#: src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782
+#: src/sid/xs_interface.c:1157
 msgid "STIL file:"
 msgstr "STIL-Datei:"
 
-#: src/sid/xmms-sid.glade:2669
-#: src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819
+#: src/sid/xs_interface.c:1173
 msgid "Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory."
 msgstr "Pfad und Dateiname der STIL-Datenbank-Datei (STIL.txt), üblicherweise im HVSC-DOCUMENTS-Unterverzeichnis."
 
-#: src/sid/xmms-sid.glade:2704
-#: src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854
+#: src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr "Nach STIL-Datenbank-Datei suchen"
 
-#: src/sid/xmms-sid.glade:2738
-#: src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888
+#: src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr "HVSC-Pfad:"
 
-#: src/sid/xmms-sid.glade:2775
-#: src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925
+#: src/sid/xs_interface.c:1209
 msgid "Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/"
 msgstr "Pfad zum Basis-Verzeichnis der High Voltage SID Collection (HVSC), zum Beispiel /media/C64Music/"
 
-#: src/sid/xmms-sid.glade:2810
-#: src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960
+#: src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr "Nach HVSC-Pfad suchen"
 
-#: src/sid/xmms-sid.glade:2840
-#: src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990
+#: src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr "SID Tune Information List (STIL)-Datenbank:"
 
-#: src/sid/xmms-sid.glade:2913
-#: src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063
+#: src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927
-#: src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077
+#: src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr "Alle Änderungen verwerfen"
 
-#: src/sid/xmms-sid.glade:2952
-#: src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102
+#: src/sid/xs_interface.c:1543
 msgid "Audacious-SID Fileinfo"
 msgstr "Audacious-SID-Dateiinformation"
 
-#: src/sid/xmms-sid.glade:3022
-#: src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172
+#: src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr "Titel:"
 
-#: src/sid/xmms-sid.glade:3050
-#: src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200
+#: src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr "Komponist:"
 
-#: src/sid/xmms-sid.glade:3078
-#: src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228
+#: src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/sid/xmms-sid.glade:3192
-#: src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342
+#: src/sid/xs_interface.c:1632
 msgid "Song Information:"
 msgstr "Titel-Information:"
 
-#: src/sid/xmms-sid.glade:3266
-#: src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416
+#: src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/sid/xmms-sid.glade:3364
-#: src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514
+#: src/sid/xs_interface.c:1701
 msgid "Duration:"
 msgstr "Länge:"
 
-#: src/sid/xmms-sid.glade:3458
-#: src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608
+#: src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Ort:"
 
-#: src/sid/xmms-sid.glade:3512
-#: src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662
+#: src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr "HVSC-Titellängendatenbank auswählen"
 
-#: src/sid/xmms-sid.glade:3554
-#: src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704
+#: src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr "STIL-Datenbank auswählen"
 
-#: src/sid/xmms-sid.glade:3596
-#: src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746
+#: src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638
-#: src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788
+#: src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680
-#: src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830
+#: src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721
-#: src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939
-#: src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871
+#: src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008
+#: src/sid/xs_interface.c:2021
 msgid "Confirm selected action"
 msgstr "Gewählte Aktion bestätigen"
 
-#: src/sid/xmms-sid.glade:3759
-#: src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909
+#: src/sid/xs_interface.c:2038
 msgid "Yes"
 msgstr "Ja"
 
-#: src/sid/xmms-sid.glade:3771
-#: src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921
+#: src/sid/xs_interface.c:2044
 msgid "No"
 msgstr "Nein"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84
+#: src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "Über %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 msgid "General info"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4249,6 +4556,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr "Konnte keinen Speicher für den Audio-Daten-Buffer allozieren!\n"
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr "Konnte keinen Speicher für den Audio-Daten-Buffer allozieren!\n"
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4262,62 +4584,62 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 msgid "About SndStretch"
 msgstr "Über SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 msgid "Volume corr."
 msgstr "Lautstärkekorrektur"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
-msgstr ""
-
-#: src/sndstretch/sndstretch_xmms.c:378
+msgstr "Kurzes Überlappen"
+
+#: src/sndstretch/sndstretch_xmms.c:374
 msgid "Speed"
-msgstr ""
-
-#: src/sndstretch/sndstretch_xmms.c:379
+msgstr "Geschwindigkeit"
+
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr "Tonhöhe"
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 msgid "Scale"
-msgstr ""
-
-#: src/sndstretch/sndstretch_xmms.c:400
+msgstr "Skalierung"
+
+#: src/sndstretch/sndstretch_xmms.c:396
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguration"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Auszuführender Befehl, wenn Audacious ein neues Lied startet."
 
-#: src/song_change/song_change.c:365
-#: src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408
-#: src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332
+#: src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375
+#: src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Auszuführender Befehl am Ende eines Lieds"
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4334,11 +4656,11 @@
 "%%p: Currently playing (1 or 0)"
 msgstr ""
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid "<span size='small'>Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk.</span>"
 msgstr ""
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4400,7 +4722,7 @@
 msgid "Change playing song"
 msgstr "Aktiven Titel ändern"
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4410,15 +4732,15 @@
 "\n"
 "Von Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "Über das Extra Stereo Plugin"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Extra Stereo konfigurieren"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Effektstärke"
 
@@ -4454,43 +4776,43 @@
 msgid "Sun driver configuration"
 msgstr "Sun-Treiber-Konfiguration"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr ""
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr ""
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
 "by Konstantin Korikov"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr ""
 
@@ -4512,52 +4834,52 @@
 "Um ihn zu benützen, eine URL hinzufügen: tone://frequency1;frequency2;frequency3;...\n"
 "z.B. tone://2000;2005 für einen Ton mit 2000Hz und einen mit 2005Hz"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr "Kann Datei nicht öffnen\n"
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr "Kein unterstütztes Dateiformat\n"
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr "Datei ist beschädigt\n"
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr "Kann nicht von Datei lesen\n"
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr "Zu wenig Speicher verfügbar\n"
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 msgid "Output plugin error\n"
 msgstr "Ausgabe-Plugin-Fehler\n"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 msgid "Unknown error\n"
 msgstr "Unbekannter Fehler\n"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr "TTA-Dekoder-Fehler"
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 msgid "TTA input plugin "
 msgstr "TTA-Eingabe-Plugin "
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
@@ -4565,643 +4887,643 @@
 " für BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 msgid "About True Audio Plugin"
 msgstr "Über True-Audio-Plugin"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 msgid "ID3 Tag:"
 msgstr "ID3-Tag:"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg-Vorbis-Audio-Plugin-Konfiguration"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Ogg-Vorbis-Tags:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Titelformat:"
 
-#: src/vorbis/configure.c:164
+#: src/vorbis/configure.c:162
 #: src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "ReplayGain-Einstellungen:"
 
-#: src/vorbis/configure.c:182
+#: src/vorbis/configure.c:180
 #: src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "ReplayGain-Typ:"
 
-#: src/vorbis/configure.c:193
+#: src/vorbis/configure.c:191
 #: src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
-msgstr ""
-
-#: src/vorbis/configure.c:203
+msgstr "Benutze Track Gain/Peak"
+
+#: src/vorbis/configure.c:201
 #: src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
-msgstr ""
-
-#: src/vorbis/configure.c:215
+msgstr "Benutze Album Gain/Peak"
+
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Classic Rock"
 msgstr "Classic Rock"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Country"
 msgstr "Country"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Dance"
 msgstr "Dance"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Disco"
 msgstr "Disco"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Funk"
 msgstr "Funk"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Hip-Hop"
 msgstr "Hip-Hop"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 msgid "Metal"
 msgstr "Metal"
 
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Oldies"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Other"
+msgstr "Andere"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
+
+#: src/vorbis/fileinfo.c:83
+msgid "R&B"
+msgstr "R&B"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Rock"
+msgstr "Rock"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Techno"
+msgstr "Techno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternative"
+
 #: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "New Age"
+msgid "Ska"
+msgstr "Ska"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Oldies"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Andere"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Pranks"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Techno"
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vocal"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Jazz+Funk"
+msgstr "Jazz+Funk"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternative"
+msgid "Fusion"
+msgstr "Fusion"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Trance"
+msgstr "Trance"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Classical"
+msgstr "Klassisch"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Pranks"
+msgid "Instrumental"
+msgstr "Instrumental"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Soundtrack"
+msgid "Acid"
+msgstr "Acid"
+
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Spiel"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
+msgid "Sound Clip"
+msgstr "Soundclip"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambient"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
+msgid "Gospel"
+msgstr "Gospel"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vocal"
-
-#: src/vorbis/fileinfo.c:90
-msgid "Jazz+Funk"
-msgstr "Jazz+Funk"
+msgid "Noise"
+msgstr "Noise"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "AlternRock"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Fusion"
-msgstr "Fusion"
+msgid "Bass"
+msgstr "Bass"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Trance"
-msgstr "Trance"
+msgid "Soul"
+msgstr "Soul"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Classical"
-msgstr "Klassisch"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Instrumental"
-msgstr "Instrumental"
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Space"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Acid"
-msgstr "Acid"
+msgid "Meditative"
+msgstr "Meditative"
 
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Spiel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Soundclip"
+msgid "Instrumental Pop"
+msgstr "Instrumental Pop"
 
 #: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Noise"
+msgid "Instrumental Rock"
+msgstr "Instrumental Rock"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "AlternRock"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bass"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
+msgid "Ethnic"
+msgstr "Ethnic"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gothic"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Space"
-
-#: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditative"
-
-#: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Instrumental Pop"
-
-#: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Instrumental Rock"
-
-#: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Ethnic"
-
-#: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gothic"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
 msgid "Techno-Industrial"
 msgstr "Techno-Industrial"
 
-#: src/vorbis/fileinfo.c:96
+#: src/vorbis/fileinfo.c:93
 msgid "Electronic"
 msgstr "Electronic"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Pop-Folk"
 msgstr "Pop-Folk"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Eurodance"
 msgstr "Eurodance"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Dream"
 msgstr "Dream"
 
-#: src/vorbis/fileinfo.c:98
+#: src/vorbis/fileinfo.c:95
 msgid "Southern Rock"
 msgstr "Southern Rock"
 
+#: src/vorbis/fileinfo.c:95
+msgid "Comedy"
+msgstr "Komödie"
+
+#: src/vorbis/fileinfo.c:95
+msgid "Cult"
+msgstr "Cult"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Gangsta Rap"
+msgstr "Gangsta Rap"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Top 40"
+msgstr "Top 40"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Christian Rap"
+msgstr "Christian Rap"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Pop/Funk"
+msgstr "Pop/Funk"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Jungle"
+msgstr "Jungle"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Native American"
+msgstr "Native American"
+
 #: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Komödie"
+msgid "Cabaret"
+msgstr "Kabarett"
 
 #: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Cult"
+msgid "New Wave"
+msgstr "New Wave"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelic"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Gangsta Rap"
-msgstr "Gangsta Rap"
+msgid "Showtunes"
+msgstr "Showtunes"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Top 40"
-msgstr "Top 40"
+msgid "Trailer"
+msgstr "Trailer"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Christian Rap"
-msgstr "Christian Rap"
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Pop/Funk"
-msgstr "Pop/Funk"
+msgid "Acid Punk"
+msgstr "Acid Punk"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Jungle"
-msgstr "Jungle"
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Native American"
-msgstr "Native American"
-
-#: src/vorbis/fileinfo.c:101
-msgid "Cabaret"
-msgstr "Kabarett"
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
 
 #: src/vorbis/fileinfo.c:101
-msgid "New Wave"
-msgstr "New Wave"
-
-#: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelic"
+msgid "Musical"
+msgstr "Musical"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Trailer"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "Rock & Roll"
+msgstr "Rock & Roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
+
+#: src/vorbis/fileinfo.c:102
+msgid "National Folk"
+msgstr "National Folk"
+
+#: src/vorbis/fileinfo.c:102
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Musical"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Rock & Roll"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Hard Rock"
+msgid "Bebob"
+msgstr "Bebob"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Latin"
+msgstr "Latin"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Folk"
-
-#: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "National Folk"
-
-#: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Latin"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
-
-#: src/vorbis/fileinfo.c:107
 msgid "Celtic"
 msgstr "Keltisch"
 
-#: src/vorbis/fileinfo.c:107
+#: src/vorbis/fileinfo.c:104
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/vorbis/fileinfo.c:107
+#: src/vorbis/fileinfo.c:104
 msgid "Avantgarde"
 msgstr "Avantgarde"
 
-#: src/vorbis/fileinfo.c:108
+#: src/vorbis/fileinfo.c:105
 msgid "Gothic Rock"
 msgstr "Gothic Rock"
 
-#: src/vorbis/fileinfo.c:108
+#: src/vorbis/fileinfo.c:105
 msgid "Progressive Rock"
 msgstr "Progressive Rock"
 
-#: src/vorbis/fileinfo.c:109
+#: src/vorbis/fileinfo.c:106
 msgid "Psychedelic Rock"
 msgstr "Psychedelic Rock"
 
-#: src/vorbis/fileinfo.c:109
+#: src/vorbis/fileinfo.c:106
 msgid "Symphonic Rock"
 msgstr "Symphonic Rock"
 
+#: src/vorbis/fileinfo.c:106
+msgid "Slow Rock"
+msgstr "Slow Rock"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chor"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Acoustic"
+msgstr "Acoustic"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Humour"
+msgstr "Humor"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Speech"
+msgstr "Rede"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Chanson"
+msgstr "Chanson"
+
 #: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Slow Rock"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
+msgid "Opera"
+msgstr "Oper"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Chamber Music"
+msgstr "Kammermusik"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Sonata"
+msgstr "Sonate"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Symphonie"
 
 #: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chor"
+msgid "Booty Bass"
+msgstr "Booty Bass"
 
 #: src/vorbis/fileinfo.c:110
-msgid "Easy Listening"
-msgstr "Easy Listening"
-
-#: src/vorbis/fileinfo.c:111
-msgid "Acoustic"
-msgstr "Acoustic"
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
 
 #: src/vorbis/fileinfo.c:111
-msgid "Humour"
-msgstr "Humor"
+msgid "Satire"
+msgstr "Satire"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
 
 #: src/vorbis/fileinfo.c:111
-msgid "Speech"
-msgstr "Rede"
+msgid "Club"
+msgstr "Club"
 
 #: src/vorbis/fileinfo.c:111
-msgid "Chanson"
-msgstr "Chanson"
+msgid "Tango"
+msgstr "Tango"
 
 #: src/vorbis/fileinfo.c:112
-msgid "Opera"
-msgstr "Oper"
+msgid "Samba"
+msgstr "Samba"
 
 #: src/vorbis/fileinfo.c:112
-msgid "Chamber Music"
-msgstr "Kammermusik"
+msgid "Folklore"
+msgstr "Folklore"
 
 #: src/vorbis/fileinfo.c:112
-msgid "Sonata"
-msgstr "Sonate"
+msgid "Ballad"
+msgstr "Ballad"
 
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Symphonie"
+msgid "Power Ballad"
+msgstr "Power Ballad"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
+msgid "Rhythmic Soul"
+msgstr "Rhythmic Soul"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Freestyle"
+msgstr "Freestyle"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
+msgid "Duet"
+msgstr "Duett"
 
 #: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Satire"
+msgid "Punk Rock"
+msgstr "Punk Rock"
 
 #: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
+msgid "Drum Solo"
+msgstr "Schlagzeug-Solo"
 
 #: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Club"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
+msgid "A Cappella"
+msgstr "A Cappella"
 
 #: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folklore"
+msgid "Euro-House"
+msgstr "Euro-House"
 
 #: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Ballad"
+msgid "Dance Hall"
+msgstr "Dance Hall"
 
 #: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Power Ballad"
+msgid "Goa"
+msgstr "Goa"
 
 #: src/vorbis/fileinfo.c:116
-msgid "Rhythmic Soul"
-msgstr "Rhythmic Soul"
+msgid "Drum & Bass"
+msgstr "Schlagzeug & Bass"
 
 #: src/vorbis/fileinfo.c:116
-msgid "Freestyle"
-msgstr "Freestyle"
+msgid "Club-House"
+msgstr "Club-House"
 
 #: src/vorbis/fileinfo.c:116
-msgid "Duet"
-msgstr "Duett"
+msgid "Hardcore"
+msgstr "Hardcore"
 
 #: src/vorbis/fileinfo.c:117
-msgid "Punk Rock"
-msgstr "Punk Rock"
+msgid "Terror"
+msgstr "Terror"
 
 #: src/vorbis/fileinfo.c:117
-msgid "Drum Solo"
-msgstr "Schlagzeug-Solo"
+msgid "Indie"
+msgstr "Indie"
 
 #: src/vorbis/fileinfo.c:117
-msgid "A Cappella"
-msgstr "A Cappella"
-
-#: src/vorbis/fileinfo.c:118
-msgid "Euro-House"
-msgstr "Euro-House"
+msgid "BritPop"
+msgstr "BritPop"
+
+#: src/vorbis/fileinfo.c:117
+msgid "Negerpunk"
+msgstr "Negerpunk"
 
 #: src/vorbis/fileinfo.c:118
-msgid "Dance Hall"
-msgstr "Dance Hall"
+msgid "Polsk Punk"
+msgstr "Polsk Punk"
 
 #: src/vorbis/fileinfo.c:118
-msgid "Goa"
-msgstr "Goa"
-
-#: src/vorbis/fileinfo.c:119
-msgid "Drum & Bass"
-msgstr "Schlagzeug & Bass"
-
-#: src/vorbis/fileinfo.c:119
-msgid "Club-House"
-msgstr "Club-House"
+msgid "Beat"
+msgstr "Beat"
+
+#: src/vorbis/fileinfo.c:118
+msgid "Christian Gangsta Rap"
+msgstr "Christian Gangsta Rap"
 
 #: src/vorbis/fileinfo.c:119
-msgid "Hardcore"
-msgstr "Hardcore"
-
-#: src/vorbis/fileinfo.c:120
-msgid "Terror"
-msgstr "Terror"
-
-#: src/vorbis/fileinfo.c:120
-msgid "Indie"
-msgstr "Indie"
-
-#: src/vorbis/fileinfo.c:120
-msgid "BritPop"
-msgstr "BritPop"
-
-#: src/vorbis/fileinfo.c:120
-msgid "Negerpunk"
-msgstr "Negerpunk"
-
-#: src/vorbis/fileinfo.c:121
-msgid "Polsk Punk"
-msgstr "Polsk Punk"
-
-#: src/vorbis/fileinfo.c:121
-msgid "Beat"
-msgstr "Beat"
-
-#: src/vorbis/fileinfo.c:121
-msgid "Christian Gangsta Rap"
-msgstr "Christian Gangsta Rap"
-
-#: src/vorbis/fileinfo.c:122
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Contemporary Christian"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Christian Rock"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5210,133 +5532,133 @@
 "Es ist ein Fehler aufgetreten:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Fehler!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Verändern des Tags fehlgeschlagen (Öffnen)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Verändern des Tags fehlgeschlagen (Schließen)"
 
-#: src/vorbis/fileinfo.c:324
-#: src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321
+#: src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Verändern des Tags fehlgeschlagen"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Ort:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Version:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "ISRC-Nummer:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Ogg-Vorbis-Informationen "
 
-#: src/vorbis/fileinfo.c:841
-#: src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838
+#: src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Bitrate:"
 
-#: src/vorbis/fileinfo.c:854
-#: src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851
+#: src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Abtastfrequenz:"
 
-#: src/vorbis/fileinfo.c:880
-#: src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877
+#: src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Länge:"
 
-#: src/vorbis/fileinfo.c:893
-#: src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890
+#: src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Dateigrösse:"
 
+#: src/vorbis/fileinfo.c:916
 #: src/vorbis/fileinfo.c:919
 #: src/vorbis/fileinfo.c:922
 #: src/vorbis/fileinfo.c:925
 #: src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
 msgid "N/A"
 msgstr "K/A"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d KBit/s (nominell)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d Bytes"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Über Ogg-Vorbis-Audio-Plugin"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5353,6 +5675,20 @@
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
 msgstr ""
+"Ogg Vorbis-Plugin der Xiph.org Foundation\n"
+"\n"
+"Original-Code von\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\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"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"\n"
+"Die Xiph.org Foundation besuchen auf http://www.xiph.org/\n"
 
 #: src/vtx/about.c:22
 msgid "About Vortex Player"
@@ -5368,6 +5704,13 @@
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Vortex-Dateiformat-Player von Sashnov Alexander <sashnov@ngs.ru>\n"
+"Gegründet auf dem Original-Quellcode in_vtx.dll von Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Musik im vtx-Format kann gefunden werden auf http://vtx.microfor.ru/music.htm\n"
+"und anderen AY/YM-Musikseiten.\n"
+"\n"
+"Audacious-Implementierung von Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/ui.cxx:52
 #, c-format
@@ -5453,11 +5796,11 @@
 msgid "General Plugin Settings:"
 msgstr "Allgemeine Plugin-Einstellungen:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "Über die sndfile-WAV-Unterstützung"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5479,39 +5822,35 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA  02110-1301  USA"
 msgstr ""
-
-#: src/wav/wav-sndfile.c:574
+"An Audacious angepasst von Tony Vroon <chainsaw@gentoo.org>\n"
+"vom xmms_sndfile-Plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\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.  \n"
+"See the GNU General Public License for more details. \n"
+"\n"
+"You should have received a copy of the GNU General Public \n"
+"License along with this program ; if not, write to \n"
+"the Free Software Foundation, Inc., \n"
+"51 Franklin Street, Fifth Floor, \n"
+"Boston, MA  02110-1301  USA"
+
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "sndfile-WAV-Plugin"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "Über %s"
-
-#, fuzzy
-#~ msgid "Subtune Control"
-#~ msgstr "Lautstärkesteuerung:"
-#~ msgid "Load"
-#~ msgstr "Laden"
-
-#, fuzzy
-#~ msgid "No sub-tune control."
-#~ msgstr "Lautstärkesteuerung:"
-
-#, fuzzy
-#~ msgid "12000"
-#~ msgstr "11000 Hz"
-
-#, fuzzy
-#~ msgid "16000"
-#~ msgstr "11000 Hz"
-
-#, fuzzy
-#~ msgid "24000"
-#~ msgstr "22000 Hz"
-
-#, fuzzy
-#~ msgid "32000"
-#~ msgstr "22000 Hz"
-
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/fr.po	Thu Nov 01 15:38:07 2007 +0100
@@ -0,0 +1,6250 @@
+# French language translation for Audacious (plugins)
+#
+# Translator :
+#
+# Stany Henry (StrassBoy) <StrassBoy@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
+"PO-Revision-Date: 2007-10-27 11:24+0100\n"
+"Last-Translator: Stany Henry <StrassBoy@gmail.com>\n"
+"Language-Team: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/aac/libmp4.c:285
+msgid "Using libfaad2-"
+msgstr "Le module utilise la bibliothèque 'libfaad2-"
+
+#: src/aac/libmp4.c:286
+msgid ""
+" for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr ""
+"' pour le décodage.\n"
+"\n"
+"Décodeur FAAD2 AAC/HE-AAC/HE-AACv2/DRM\n"
+"Droits d'utilisation : Nero AG, www.nero.com\n"
+"\n"
+"\n"
+"Droits d'utilisation : Équipe Audacious (2005-2006)."
+
+#: src/aac/libmp4.c:290
+msgid "About MP4 AAC player plugin"
+msgstr "À propos du module 'MP4 AAC'"
+
+#: src/aac/libmp4.c:292
+#: src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263
+#: src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77
+#: src/arts/arts.c:26
+#: src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552
+#: src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449
+#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137
+#: src/esd/about.c:49
+#: src/filewriter/filewriter.c:178
+#: src/jack/configure.c:141
+#: src/jack/jack.c:539
+#: src/madplug/fileinfo.c:158
+#: src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596
+#: src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88
+#: src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232
+#: src/null/null.c:67
+#: src/null/null.c:110
+#: src/OSS4/about.c:59
+#: src/OSS/about.c:54
+#: src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300
+#: src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577
+#: src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116
+#: src/sun/about.c:38
+#: src/sun/configure.c:559
+#: src/timidity/interface.c:222
+#: src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62
+#: src/tta/libtta.c:151
+#: src/tta/libtta.c:265
+#: src/tta/libtta.c:400
+#: src/vorbis/fileinfo.c:209
+#: src/vorbis/vorbis.c:863
+#: src/vtx/about.c:31
+#: src/vtx/info.c:43
+#: src/wavpack/ui.cxx:56
+#: src/wavpack/ui.cxx:554
+#: src/wav/wav-sndfile.c:543
+msgid "Ok"
+msgstr "OK"
+
+#: src/adplug/adplug-xmms.cc:169
+msgid "About "
+msgstr "À propos de "
+
+#: src/adplug/adplug-xmms.cc:173
+msgid ""
+"\n"
+"Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+"\n"
+"This plugin is released under the terms and conditions of the GNU LGPL.\n"
+"See http://www.gnu.org/licenses/lgpl.html for details.\n"
+"\n"
+"This plugin uses the AdPlug library, which is copyright (C) Simon Peter, et al.\n"
+"Linked AdPlug library version: "
+msgstr ""
+"\n"
+"Droits d'utilisation (2002, 2003) : Simon Peter <dn.tlp@gmx.net>\n"
+"\n"
+"Ce module est distribué sous les termes et les conditions de la licence GNU LGPL.\n"
+"Consultez la page suivante pour les détails : http://www.gnu.org/licenses/lgpl.html\n"
+"\n"
+"Cette extension utilise la bibliothèque 'AdPlug'.\n"
+"Droits d'utilisation : Simon Peter, et al.\n"
+"\n"
+"Version de la bibliothèque 'AdPlug' liée : "
+
+#: src/adplug/adplug-xmms.cc:254
+msgid "AdPlug :: Configuration"
+msgstr "Configuration de 'AdPlug'"
+
+#: src/adplug/adplug-xmms.cc:273
+#: src/alarm/interface.c:1398
+#: src/alsa/configure.c:389
+#: src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557
+#: src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145
+#: src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704
+#: src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237
+#: src/musepack/libmpc.cxx:557
+#: src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080
+#: src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125
+#: src/sun/configure.c:567
+#: src/timidity/interface.c:230
+#: src/wavpack/ui.cxx:278
+#: src/wavpack/ui.cxx:561
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/adplug/adplug-xmms.cc:289
+#: src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191
+#: src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876
+#: src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
+msgid "General"
+msgstr "Général"
+
+#: src/adplug/adplug-xmms.cc:301
+msgid "Sound quality"
+msgstr "Qualité du son"
+
+#: src/adplug/adplug-xmms.cc:306
+#: src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
+msgid "Resolution"
+msgstr "Résolution"
+
+#: src/adplug/adplug-xmms.cc:308
+msgid "8bit"
+msgstr "8 bits"
+
+#: src/adplug/adplug-xmms.cc:313
+msgid "16bit"
+msgstr "16 bits"
+
+#: src/adplug/adplug-xmms.cc:321
+#: src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199
+#: src/timidity/interface.c:148
+msgid "Channels"
+msgstr "Sortie"
+
+#: src/adplug/adplug-xmms.cc:323
+#: src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157
+#: src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
+msgid "Mono"
+msgstr "Mono"
+
+#: src/adplug/adplug-xmms.cc:328
+#: src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201
+#: src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
+msgid "Stereo"
+msgstr "Stéréo"
+
+#: src/adplug/adplug-xmms.cc:332
+msgid "Setting stereo is not recommended, unless you need to. This won't add any stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
+msgstr "Activer le mode stéréo n'est pas recommandé, à moins que vous ne le vouliez vraiment. Cette option n'ajoutera pas d'effet stéréo au son produit (OPL2 n'utilise que le mode mono), mais nécessitera beaucoup plus de puissance CPU !"
+
+#: src/adplug/adplug-xmms.cc:340
+msgid "Frequency"
+msgstr "Fréquence"
+
+#: src/adplug/adplug-xmms.cc:376
+#: src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
+msgid "Playback"
+msgstr "Lecture"
+
+#: src/adplug/adplug-xmms.cc:380
+msgid "Detect songend"
+msgstr "Détecter la fin du morceau"
+
+#: src/adplug/adplug-xmms.cc:384
+msgid "If enabled, XMMS will detect a song's ending, stop it and advance in the playlist. If disabled, XMMS won't take notice of a song's ending and loop it all over again and again."
+msgstr "Si cette option est activée, Audacious détectera la fin du morceau, interrompra la lecture, puis passera au titre suivant dans la liste de lecture. Dans le cas contraire, Audacious ne se préoccupera pas de la fin des morceaux : le titre sera lu en boucle."
+
+#: src/adplug/adplug-xmms.cc:395
+msgid "Formats"
+msgstr "Formats"
+
+#: src/adplug/adplug-xmms.cc:402
+msgid "Format selection"
+msgstr "Choix des formats"
+
+#: src/adplug/adplug-xmms.cc:405
+msgid "Format"
+msgstr "Format"
+
+#: src/adplug/adplug-xmms.cc:405
+msgid "Extension"
+msgstr "Extension"
+
+#: src/adplug/adplug-xmms.cc:445
+msgid "Selected file types will be recognized and played back by this plugin. Deselected types will be ignored to make room for other plugins to play these files."
+msgstr "Les types de fichiers sélectionnés seront reconnus et gérés par ce module. Les autres seront ignorés, de manière à pouvoir être supportés par d'autres extensions."
+
+#: src/adplug/adplug-xmms.cc:531
+msgid "AdPlug :: File Info"
+msgstr "Informations sur le fichier"
+
+#: src/adplug/adplug-xmms.cc:553
+#: src/amidi-plug/i_configure-fluidsynth.c:448
+msgid "Filename"
+msgstr "Nom du fichier"
+
+#: src/adplug/adplug-xmms.cc:557
+msgid "Title: "
+msgstr "Titre : "
+
+#: src/adplug/adplug-xmms.cc:558
+msgid "Author: "
+msgstr "Auteur : "
+
+#: src/adplug/adplug-xmms.cc:559
+msgid "File Type: "
+msgstr "Format : "
+
+#: src/adplug/adplug-xmms.cc:560
+msgid "Subsongs: "
+msgstr "Sous-modules : "
+
+#: src/adplug/adplug-xmms.cc:561
+msgid "Instruments: "
+msgstr "Instruments : "
+
+#: src/adplug/adplug-xmms.cc:566
+msgid "Orders: "
+msgstr "Partitions : "
+
+#: src/adplug/adplug-xmms.cc:567
+msgid "Patterns: "
+msgstr "Séquences : "
+
+#: src/adplug/adplug-xmms.cc:571
+msgid "Song"
+msgstr "Morceau"
+
+#: src/adplug/adplug-xmms.cc:597
+msgid "Instrument name"
+msgstr "Nom de l'instrument"
+
+#: src/adplug/adplug-xmms.cc:639
+msgid "Song message"
+msgstr "Commentaires"
+
+#: src/adplug/adplug-xmms.cc:661
+msgid "Subsong selection"
+msgstr "Sélection du sous-module"
+
+#: src/adplug/adplug-xmms.cc:725
+msgid "Order: "
+msgstr "Partition : "
+
+#: src/adplug/adplug-xmms.cc:726
+msgid "Pattern: "
+msgstr "Séquence : "
+
+#: src/adplug/adplug-xmms.cc:728
+msgid "Row: "
+msgstr "Ligne : "
+
+#: src/adplug/adplug-xmms.cc:729
+msgid "Speed: "
+msgstr "Vitesse : "
+
+#: src/adplug/adplug-xmms.cc:730
+msgid "Timer: "
+msgstr "Fréquence : "
+
+#: src/adplug/adplug-xmms.cc:731
+#: src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332
+#: src/sid/xs_interface.c:341
+msgid "Hz"
+msgstr "Hz"
+
+#: src/alac/plugin.c:74
+msgid "About Apple Lossless Audio Plugin"
+msgstr "À propos du module audio 'Apple Lossless'"
+
+#: src/alac/plugin.c:75
+msgid ""
+"Copyright (c) 2006 Audacious team\n"
+"Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
+msgstr ""
+"Droits d'utilisation :\n"
+"\n"
+"(2006)           Équipe de développement Audacious\n"
+"(2005-2006)  David Hammerton  <crazney -at- crazney.net> (morceaux de code)"
+
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr "À propos du module 'Alarm'"
+
+#: src/alarm/interface.c:47
+msgid "XMMS Alarm"
+msgstr "'Alarm'"
+
+#: src/alarm/interface.c:56
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"Ce module pour XMMS peut être utilisé pour\n"
+"commencer la lecture à un moment donné.\n"
+"\n"
+"\n"
+"Vous pouvez envoyer toutes vos remarques à :\n"
+"\n"
+"Adam Feakin      <adamf@snika.uklinux.net>\n"
+"Daniel Stodden  <stodden@in.tum.de>\n"
+"\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:71
+#: src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960
+#: src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643
+#: src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
+msgid "Close"
+msgstr "Fermer"
+
+#: src/alarm/interface.c:101
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:109
+msgid "This is your wakeup call."
+msgstr "L'appel du réveil... ;-)"
+
+#: src/alarm/interface.c:124
+#: src/alarm/interface.c:1389
+#: src/alsa/about.c:46
+#: src/alsa/configure.c:383
+#: src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726
+#: src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914
+#: src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622
+#: src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44
+#: src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:152
+msgid "Select Playlist"
+msgstr "Choisir une liste de lecture"
+
+#: src/alarm/interface.c:196
+msgid "Sorry"
+msgstr "Désolé"
+
+#: src/alarm/interface.c:204
+msgid "Warning"
+msgstr "Avertissement"
+
+#: src/alarm/interface.c:213
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds.  This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"Pour des raisons de sécurité, le temps de \"repos\" doit au moins durer 65 secondes de plus que le temps du fondu. Il doit aussi être supérieur à 10 secondes. Cela signifie simplement que le code du module comporte une erreur... Jusqu'à ce que je trouve un moyen de le corriger de manière définitive, ce message apparaîtra :)\n"
+"\n"
+"Les préférences relatives au fondu n'ont pas été enregistrées.\n"
+"\n"
+"----\n"
+"Adam"
+
+#: src/alarm/interface.c:229
+msgid "Oh Well"
+msgstr "Eh bien... !"
+
+#: src/alarm/interface.c:388
+msgid "Alarm Settings"
+msgstr "Préférences de 'Alarm'"
+
+#: src/alarm/interface.c:404
+#: src/alarm/interface.c:576
+#: src/alarm/interface.c:948
+msgid "Time"
+msgstr "Heure"
+
+#: src/alarm/interface.c:445
+msgid "hours"
+msgstr " heures "
+
+#: src/alarm/interface.c:506
+msgid "h"
+msgstr " minutes "
+
+#: src/alarm/interface.c:536
+msgid "minutes"
+msgstr " minutes "
+
+#: src/alarm/interface.c:554
+msgid "Quiet after:"
+msgstr "Extinction après :"
+
+#: src/alarm/interface.c:564
+msgid "Alarm at (default):"
+msgstr "Heure du réveil par défaut :"
+
+#: src/alarm/interface.c:584
+msgid "Choose the days for the alarm to come on"
+msgstr "Jours d'activation de l'alarme"
+
+#: src/alarm/interface.c:612
+#: src/alarm/interface.c:660
+#: src/alarm/interface.c:708
+#: src/alarm/interface.c:756
+#: src/alarm/interface.c:804
+#: src/alarm/interface.c:852
+#: src/alarm/interface.c:900
+#: src/OSS4/configure.c:138
+#: src/OSS/configure.c:169
+msgid "Default"
+msgstr "Défaut"
+
+#: src/alarm/interface.c:938
+msgid "Day"
+msgstr "Jour"
+
+#: src/alarm/interface.c:958
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: src/alarm/interface.c:969
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: src/alarm/interface.c:980
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: src/alarm/interface.c:991
+msgid "Friday"
+msgstr "Vendredi"
+
+#: src/alarm/interface.c:1002
+msgid "Saturday"
+msgstr "Samedi"
+
+#: src/alarm/interface.c:1013
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: src/alarm/interface.c:1023
+msgid "Monday"
+msgstr "Lundi"
+
+#: src/alarm/interface.c:1034
+msgid "Days"
+msgstr "Jours"
+
+#: src/alarm/interface.c:1050
+msgid "Fading"
+msgstr "Fondu"
+
+#: src/alarm/interface.c:1087
+#: src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178
+#: src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908
+#: src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
+msgid "seconds"
+msgstr "secondes"
+
+#: src/alarm/interface.c:1095
+#: src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539
+#: src/modplug/gui/modplug.glade:1113
+msgid "Volume"
+msgstr "Volume"
+
+#: src/alarm/interface.c:1121
+msgid "Current"
+msgstr "Volume actuel"
+
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr "Réinitialise au volume actuel du système."
+
+#: src/alarm/interface.c:1130
+msgid "Start at"
+msgstr "Début"
+
+#: src/alarm/interface.c:1158
+#: src/alarm/interface.c:1202
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1174
+msgid "Final"
+msgstr "Fin"
+
+#: src/alarm/interface.c:1227
+msgid "Additional Command"
+msgstr "Commande supplémentaire"
+
+#: src/alarm/interface.c:1253
+msgid "enable"
+msgstr "Activer"
+
+#: src/alarm/interface.c:1261
+msgid "Playlist (optional)"
+msgstr "Liste de lecture (option facultative)"
+
+#: src/alarm/interface.c:1287
+msgid "Browse..."
+msgstr "Parcourir"
+
+#: src/alarm/interface.c:1295
+#: src/alarm/interface.c:1460
+msgid "Reminder"
+msgstr "Pense-bête"
+
+#: src/alarm/interface.c:1312
+msgid "Use reminder"
+msgstr "Utiliser le pense-bête"
+
+#: src/alarm/interface.c:1328
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "Options"
+msgstr "Options"
+
+#: src/alarm/interface.c:1336
+msgid "What do these options mean?"
+msgstr "Que signifient donc ces options ?"
+
+#: src/alarm/interface.c:1364
+msgid ""
+"\n"
+"Time\n"
+"  Alarm at: \n"
+"    The time for the alarm to come on.\n"
+"\n"
+"  Quiet After: \n"
+"    Stop alarm after this amount of time.\n"
+"       (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+"  Day:\n"
+"    Select the days for the alarm to activate.\n"
+"\n"
+"  Time:\n"
+"    Choose the time for the alarm on each day,\n"
+"    or select the toggle button to use the default\n"
+"    time.\n"
+"\n"
+"\n"
+"Volume\n"
+"  Fading: \n"
+"    Fade the volume up to the chosen volume \n"
+"    for this amount of time.\n"
+"\n"
+"  Start at: \n"
+"    Start fading from this volume.\n"
+"\n"
+"  Final: \n"
+"    The volume to stop fading at.  If the fading\n"
+"    time is 0 then set volume to this and start\n"
+"    playing.\n"
+"\n"
+"\n"
+"Options:\n"
+"  Additional Command:\n"
+"    Run this command at the alarm time.\n"
+"\n"
+"  Playlist: \n"
+"    Load this playlist for playing songs from \n"
+"    (must have .m3u extension).  If no playlist\n"
+"    is given then the songs which are currently\n"
+"    in the list will be used.\n"
+"    The URL of an mp3/ogg stream can also be\n"
+"    entered here, but loading of playlists from\n"
+"    URLs is not currently supported by xmms.\n"
+"\n"
+"  Reminder:\n"
+"    Display a reminder when the alarm goes off,\n"
+"    type the reminder in the box and turn on the\n"
+"    toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"*** Alarme ***\n"
+"\n"
+"\n"
+"Heure de l'alarme :\n"
+"\n"
+"heure à laquelle l'alarme sera activée.\n"
+"\n"
+"\n"
+"Extinction :\n"
+"\n"
+"laps de temps après lequel l'alarme cessera\n"
+"(si la fenêtre du réveil n'est pas fermée).\n"
+"\n"
+"\n"
+"*** Jours ***\n"
+"\n"
+"\n"
+"Jour :\n"
+"\n"
+"détermine le jour d'activation de l'alarme.\n"
+"\n"
+"\n"
+"Heure :\n"
+"\n"
+"détermine l'heure d'activation de l'alarme\n"
+"(vous pouvez spécifier une heure précise ou utiliser le bouton 'défaut)'.\n"
+"\n"
+"\n"
+"*** Volume ***\n"
+"\n"
+"\n"
+"Fondu :\n"
+"\n"
+"applique un effet de fondu au volume sonore, pour le laps de temps indiqué.\n"
+"\n"
+"\n"
+"Début :\n"
+"\n"
+"applique le fondu à partir du niveau sonore déterminé.\n"
+"\n"
+"\n"
+"Fin :\n"
+"\n"
+"détermine le volume à partir duquel le fondu ne sera plus appliqué\n"
+"(si la durée du fondu correspond à 0, le volume de fin de fondu déterminera\n"
+"le niveau sonore de l'alarme).\n"
+"\n"
+"\n"
+"*** Options ***\n"
+"\n"
+"\n"
+"Commande supplémentaire :\n"
+"\n"
+"la commande spécifiée sera exécutée en même temps que l'alarme.\n"
+"\n"
+"\n"
+"Liste de lecture :\n"
+"\n"
+"lis une liste de lecture particulière (l'extension doit être '.m3u').\n"
+"Si aucune liste particulière n'est spécifiée, ce sont les titres de la liste active\n"
+"du lecteur qui seront utilisés.\n"
+"L'adresse d'un flux distant 'mp3' ou 'ogg' peut également constituer une source.\n"
+"\n"
+"\n"
+"Pense-bête :\n"
+"\n"
+"affiche un texte de rappel, lors de l'extinction de l'alarme\n"
+"(écrivez le message dans le champ prévu à cet effet, puis cochez l'option du pense-bête).\n"
+
+#: src/alarm/interface.c:1366
+msgid "Help"
+msgstr "Aide"
+
+#: src/alarm/interface.c:1468
+msgid "Your reminder for today is.."
+msgstr "Le pense-bête du jour est..."
+
+#: src/alarm/interface.c:1493
+msgid "Thankyou"
+msgstr "Merci"
+
+#: src/alsa/about.c:30
+msgid "About ALSA Driver"
+msgstr "À propos du pilote 'ALSA'"
+
+#: src/alsa/about.c:31
+msgid ""
+"Audacious ALSA Driver\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.\n"
+"Author: Matthieu Sozeau (mattam@altern.org)"
+msgstr ""
+"Pilote 'ALSA' pour Audacious\n"
+"\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis.\n"
+"\n"
+"\n"
+"Auteur : Matthieu Sozeau (mattam@altern.org)"
+
+#: src/alsa/configure.c:146
+msgid "Unknown soundcard"
+msgstr "Carte son inconnue"
+
+#: src/alsa/configure.c:201
+#, c-format
+msgid "Default PCM device (%s)"
+msgstr "Périphérique PCM par défaut (%s)"
+
+#: src/alsa/configure.c:260
+msgid "ALSA Driver configuration"
+msgstr "Configuration du pilote 'ALSA'"
+
+#: src/alsa/configure.c:274
+#: src/OSS4/configure.c:186
+#: src/OSS/configure.c:217
+#: src/sun/configure.c:183
+msgid "Audio device:"
+msgstr "Périphérique audio :"
+
+#: src/alsa/configure.c:288
+msgid "Mixer:"
+msgstr "Mélangeur audio :"
+
+#: src/alsa/configure.c:300
+msgid "Mixer card:"
+msgstr "Carte de mélange audio :"
+
+#: src/alsa/configure.c:313
+#: src/OSS/configure.c:260
+#: src/sun/configure.c:220
+msgid "Mixer device:"
+msgstr "Mélangeur audio :"
+
+#: src/alsa/configure.c:328
+msgid "Device settings"
+msgstr "Paramètres du périphérique"
+
+#: src/alsa/configure.c:334
+msgid "Soundcard:"
+msgstr "Carte son :"
+
+#: src/alsa/configure.c:347
+msgid "Buffer time (ms):"
+msgstr "Tampon (ms) :"
+
+#: src/alsa/configure.c:361
+msgid "Period time (ms):"
+msgstr "Période (ms) :"
+
+#: src/alsa/configure.c:376
+#: src/amidi-plug/i_configure-ap.c:287
+msgid "Advanced settings"
+msgstr "Paramètres avancés"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "ALSA "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur 'ALSA' que l'utilisateur a spécifié. L'interface du séquenceur 'ALSA' offre des possibilités variées : elle peut fournir des ports aux synthétiseurs matériels des cartes sons ('emu10k1', par exemple), mais aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\n"
+"Ce système de sortie ne produit pas de flux audio : les événements MIDI sont gérés directement par les périphériques et les applications associés aux ports 'ALSA'. Par exemple, les événements MIDI envoyés au synthétiseur matériel seront directement interprétés.\n"
+"\n"
+"Auteur : Giacomo Lozito."
+
+#: src/amidi-plug/backend-dummy/b-dummy.c:35
+msgid "Dummy Backend "
+msgstr "Dummy "
+
+#: src/amidi-plug/backend-dummy/b-dummy.c:37
+msgid ""
+"This backend does not produce audio at all. It is mostly useful for analysis and testing purposes, as it can log all MIDI events to standard output, standard error or file.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Ce système de sortie ne produit absolument pas de flux audio. Il est principalement utile à des fins d'analyses et d'essais, parce qu'il peut consigner tous les événements MIDI dans la sortie standard, dans la sortie d'erreurs ou dans un fichier.\n"
+"\n"
+"Auteur : Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:35
+msgid "FluidSynth Backend "
+msgstr "FluidSynth "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:37
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Ce système de sortie produit des flux audio en envoyant les événements MIDI à 'FluidSynth', un synthétiseur logiciel en temps réel sur les caractéristiques de 'SoundFont2' (www.fluidsynth.org).\n"
+"Les flux générés peuvent être manipulés grâce aux modules d'effets du lecteur et sont traités par le module de sortie sélectionné.\n"
+"\n"
+"Auteur : Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:221
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "CONFIGURATION DU SYSTÈME DE SORTIE 'ALSA'"
+
+#: src/amidi-plug/i_configure-alsa.c:326
+msgid "Port"
+msgstr "Port"
+
+#: src/amidi-plug/i_configure-alsa.c:328
+msgid "Client name"
+msgstr "Nom du client"
+
+#: src/amidi-plug/i_configure-alsa.c:330
+msgid "Port name"
+msgstr "Nom du port"
+
+#: src/amidi-plug/i_configure-alsa.c:341
+msgid "ALSA output ports"
+msgstr "Ports de sortie 'ALSA'"
+
+#: src/amidi-plug/i_configure-alsa.c:394
+msgid "Soundcard: "
+msgstr "Périphérique audio : "
+
+#: src/amidi-plug/i_configure-alsa.c:396
+msgid "Mixer control: "
+msgstr "Canal du mélangeur audio : "
+
+#: src/amidi-plug/i_configure-alsa.c:408
+msgid "Mixer settings"
+msgstr "Paramètres du mélangeur"
+
+#: src/amidi-plug/i_configure-alsa.c:421
+msgid ""
+"* Select ALSA output ports *\n"
+"MIDI events will be sent to the ports selected here. In example, if your audio card provides a hardware synth and you want to play MIDI with it, you'll probably want to select the wavetable synthesizer ports."
+msgstr ""
+"* Choix des ports de sortie 'ALSA' *\n"
+"Les événements MIDI seront envoyés aux ports spécifiés. Par exemple, si votre carte son dispose d'un synthétiseur matériel et que vous désirez écouter les fichiers MIDI avec celui-ci, vous voudrez probabement choisir les ports du synthétiseur à tables d'ondes."
+
+#: src/amidi-plug/i_configure-alsa.c:426
+msgid ""
+"* Select ALSA mixer card *\n"
+"The ALSA backend outputs directly through ALSA, it doesn't use effect and ouput plugins from the player. During playback, the player volumeslider will manipulate the mixer control you select here. If you're using wavetable synthesizer ports, you'll probably want to select the Synth control here."
+msgstr ""
+"* Choix du périphérique audio 'ALSA' *\n"
+"Le système de sortie 'ALSA' émet directement via 'ALSA' : il n'utilise pas les modules d'effets du lecteur, ni les modules de sortie. Lors de la lecture, le curseur du volume du lecteur manipulera le contrôleur du mélangeur audio que vous avez sélectionné. Si vous utilisez les ports d'un synthétiseur à tables d'ondes, vous voudrez probabement choisir le contrôleur du synthétiseur."
+
+#: src/amidi-plug/i_configure-alsa.c:433
+msgid ""
+"* Select ALSA mixer control *\n"
+"The ALSA backend outputs directly through ALSA, it doesn't use effect and ouput plugins from the player. During playback, the player volume slider will manipulate the mixer control you select here. If you're using wavetable synthesizer ports, you'll probably want to select the Synth control here."
+msgstr ""
+"* Choix du canal du mélangeur audio 'ALSA' *\n"
+"Le système de sortie 'ALSA' émet directement via 'ALSA' : il n'utilise pas les modules d'effets du lecteur, ni les modules de sortie. Lors de la lecture, le curseur du volume du lecteur manipulera le canal du mélangeur audio que vous avez sélectionné. Si vous utilisez les ports d'un synthétiseur à tables d'ondes, vous voudrez probabement choisir le canal du synthétiseur."
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "ALSA Backend not loaded or not available"
+msgstr "Le système de sortie 'ALSA' n'est pas chargé ou n'est pas disponible"
+
+#: src/amidi-plug/i_configure-alsa.c:463
+msgid ""
+"<span size=\"smaller\">ALSA\n"
+"backend</span>"
+msgstr ""
+"<span size=\"smaller\">Sortie\n"
+"'ALSA'</span>"
+
+#: src/amidi-plug/i_configure-ap.c:56
+msgid "AMIDI-Plug - backend information"
+msgstr "Informations sur le système de sortie"
+
+#: src/amidi-plug/i_configure-ap.c:194
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "PRÉFÉRENCES DE 'AMIDI-PLUG'"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Choix du système de sortie"
+
+#: src/amidi-plug/i_configure-ap.c:225
+msgid "Available backends"
+msgstr "Systèmes disponibles :"
+
+#: src/amidi-plug/i_configure-ap.c:255
+msgid "Playback settings"
+msgstr "Paramètres de lecture"
+
+#: src/amidi-plug/i_configure-ap.c:260
+msgid "Transpose: "
+msgstr "Transposition : "
+
+#: src/amidi-plug/i_configure-ap.c:269
+msgid "Drum shift: "
+msgstr "Décalage des percussions :"
+
+#: src/amidi-plug/i_configure-ap.c:291
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "Précalculer la durée des fichiers MIDI dans la liste de lecture"
+
+#: src/amidi-plug/i_configure-ap.c:296
+msgid "extract comments from MIDI file (if available)"
+msgstr "Extraire les commentaires des fichiers MIDI (s'ils sont disponibles)"
+
+#: src/amidi-plug/i_configure-ap.c:301
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "Extraire les paroles des fichiers MIDI (si elles sont disponible)"
+
+#: src/amidi-plug/i_configure-ap.c:320
+msgid ""
+"* Backend selection *\n"
+"AMIDI-Plug works with backends, in a modular fashion; here you should select your backend; that is, the way MIDI events are going to be handled and played.\n"
+"If you have a hardware synthesizer on your audio card, and ALSA supports it, you'll want to use the ALSA backend. It can also be used with anything that provides an interface to the ALSA sequencer, including software synths or external devices.\n"
+"If you want to rely on a software synthesizer and/or want to pipe audio into effect and output plugins of the player you'll want to use the good FluidSynth backend.\n"
+"Press the info button to read specific information about each backend."
+msgstr ""
+"* Choix du système de sortie *\n"
+"'AMIDI-Plug' utilise des systèmes de sortie, de manière modulaire. C'est par le système de sortie que vous aurez choisi que seront gérés et restitués les événements MIDI. Si votre périphérique audio dispose d'un synthétiseur matériel supporté par 'ALSA', vous voudrez utiliser le système de sortie 'ALSA'. Celui-ci peut aussi être utilisé par tout ce qui peut offrir une interface au séquenceur 'ALSA' (les synthétiseurs logiciels ou les périphériques externes, notamment).\n"
+" Si vous désirez dépendre d'un synthétiseur logiciel et/ou si vous voulez rediriger le flux audio vers les modules de sortie du lecteur, vous pourrez utiliser le système de sortie 'FluidSynth'. N'hésitez pas à activer le bouton d'informations, afin d'obtenir des renseignements spécifiques à chaque système de sortie."
+
+#: src/amidi-plug/i_configure-ap.c:331
+msgid ""
+"* Transpose function *\n"
+"This option allows you to play the midi file transposed in a different key, by shifting of the desired number of semitones all its notes (excepting those on midi channel 10, reserved for percussions). Expecially useful if you wish to sing or play along with another instrument."
+msgstr ""
+"* Fonction de transposition *\n"
+"Cette option permet de restituer le fichier MIDI alors transposé dans une tonalité différente, en décalant du nombre désiré de demi-tons toutes les les notes du morceau (à l'exception de celles du canal MIDI 10, réservé aux percussions). Cette fonction est particulièrement utile, si vous désirez chanter ou jouer accompagné d'un autre instrument."
+
+#: src/amidi-plug/i_configure-ap.c:337
+msgid ""
+"* Drumshift function *\n"
+"This option allows you to shift notes on midi channel 10 (the standard percussions channel) of the desired number of semitones. This results in different drumset and percussions being used during midi playback, so if you wish to enhance (or reduce, or alter) percussion sounds, try to play with this value."
+msgstr ""
+"* Fonction de décalage des percussions *\n"
+"Cette option permet de décaler toutes les notes du canal MIDI 10 (le canal standard des percussions) du nombre désiré de demi-tons. Cela se traduit par l'utilisation d'un ensemble de batteries et de percussions différent, lors de la lecture. Donc, si vous désirez amémiorer (ou réduire, ou bien encore altérer) les percussions, n'hésitez pas à essayer différentes valeurs."
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"* Pre-calculate MIDI length *\n"
+"If this option is enabled, AMIDI-Plug will calculate the MIDI file length as soon as the player requests it, instead of doing that only when the MIDI file is being played. In example, MIDI length will be calculated straight after adding MIDI files in a playlist. Disable this option if you want faster playlist loading (when a lot of MIDI files are added), enable it to display more information in the playlist straight after loading."
+msgstr ""
+"* Pré-calculer la durée des fichiers MIDI *\n"
+"Si cette option est activée, 'AMIDI-Plug' déterminera la durée du fichier MIDI dès que le lecteur le demandera, au lieu le faire seulement lorsque le morceau est lu. Par exemple, la durée des fichiers MIDI sera calculée immédiatement après l'ajout des titres dans la liste de lecture. Désactivez cette option, si vous voulez un chargement plus rapide de la liste de lecture (lorsque de nombreux fichiers MIDI sont ajoutés) ; activez cette option pour que s'affichent plus d'informations dans la liste de lecture, directement après le chargement des fichiers."
+
+#: src/amidi-plug/i_configure-ap.c:353
+msgid ""
+"* Extract comments from MIDI files *\n"
+"Some MIDI files contain text comments (author, copyright, instrument notes, etc.). If this option is enabled, AMIDI-Plug will extract and display comments (if available) in the file information dialog."
+msgstr ""
+"* Extraire les commentaires des fichiers MIDI *\n"
+"Certains fichiers MIDI contiennent des commentaires (auteur, droits d'utilisation, notes relatives aux instruments, etc.). Si cette option est activée, 'AMIDI-Plug' extraira et afficher ces commentaires (s'ils sont disponibles) dans la fenêtre d'informations sur le fichier."
+
+#: src/amidi-plug/i_configure-ap.c:358
+msgid ""
+"* Extract lyrics from MIDI files *\n"
+"Some MIDI files contain song lyrics. If this option is enabled, AMIDI-Plug will extract and display song lyrics (if available) in the file information dialog."
+msgstr ""
+"* Extraire les paroles des fichiers MIDI *\n"
+"Certains fichiers MIDI contiennent les paroles relatives au morceau joué. Si cette option est activée, 'AMIDI-Plug' extraira et affichera les paroles (si elles sont disponibles) dans la fenêtre d'informations sur le fichier."
+
+#: src/amidi-plug/i_configure-ap.c:375
+msgid ""
+"<span size=\"smaller\">AMIDI\n"
+"Plug</span>"
+msgstr ""
+"<span size=\"smaller\">AMIDI\n"
+"Plug</span>"
+
+#: src/amidi-plug/i_configure.c:75
+msgid "AMIDI-Plug - select file"
+msgstr "'AMIDI-Plug' - choix du fichier"
+
+#: src/amidi-plug/i_configure.c:122
+msgid "AMIDI-Plug - configuration"
+msgstr "Configuration de 'AMIDI-Plug'"
+
+#: src/amidi-plug/i_configure.c:241
+msgid "AMIDI-Plug message"
+msgstr "Message de 'AMIDI-Plug'"
+
+#: src/amidi-plug/i_configure.c:242
+msgid "Please stop the player before changing AMIDI-Plug settings."
+msgstr "Veuillez arrêter le lecture avant de modifier les paramètres."
+
+#: src/amidi-plug/i_configure-dummy.c:137
+msgid "DUMMY BACKEND CONFIGURATION"
+msgstr "CONFIGURATION DU SYSTÈME DE SORTIE 'DUMMY'"
+
+#: src/amidi-plug/i_configure-dummy.c:173
+msgid "MIDI logger settings"
+msgstr "Paramètres du journal des événements MIDI"
+
+#: src/amidi-plug/i_configure-dummy.c:181
+msgid "Do not log anything"
+msgstr "Ne rien écrire dans le journal"
+
+#: src/amidi-plug/i_configure-dummy.c:185
+msgid "Log MIDI events to standard output"
+msgstr "Consigner les événements MIDI dans la sortie standard"
+
+#: src/amidi-plug/i_configure-dummy.c:189
+msgid "Log MIDI events to standard error"
+msgstr "Consigner les événements MIDI dans la sortie d'erreur standard"
+
+#: src/amidi-plug/i_configure-dummy.c:193
+msgid "Log MIDI events to file"
+msgstr "Consigner les événements MIDI dans un fichier"
+
+#: src/amidi-plug/i_configure-dummy.c:202
+msgid "Logfile settings"
+msgstr "Paramètres du fichier du journal"
+
+#: src/amidi-plug/i_configure-dummy.c:209
+msgid "Use a single file to log everything (rewrite)"
+msgstr "Utiliser un fichier unique pour tout consigner (remplacement du contenu existant)"
+
+#: src/amidi-plug/i_configure-dummy.c:213
+msgid "Use a single file to log everything (append)"
+msgstr "Utiliser un fichier unique pour tout consigner (ajout au contenu existant)"
+
+#: src/amidi-plug/i_configure-dummy.c:217
+msgid "Use a different logfile for each MIDI file"
+msgstr "Utiliser un fichier journal par fichier MIDI"
+
+#: src/amidi-plug/i_configure-dummy.c:223
+msgid "» Log dir:"
+msgstr "» Emplacement du journal :"
+
+#: src/amidi-plug/i_configure-dummy.c:229
+#: src/amidi-plug/i_configure-dummy.c:241
+msgid "browse"
+msgstr "Parcourir"
+
+#: src/amidi-plug/i_configure-dummy.c:235
+msgid "» Log file:"
+msgstr "» Fichier du journal :"
+
+#: src/amidi-plug/i_configure-dummy.c:267
+msgid "Playback speed"
+msgstr "Vitesse de lecture"
+
+#: src/amidi-plug/i_configure-dummy.c:272
+msgid "Play at normal speed"
+msgstr "Lire à une vitesse normale"
+
+#: src/amidi-plug/i_configure-dummy.c:275
+msgid "Play as fast as possible"
+msgstr "Lire le plus rapidement possible"
+
+#: src/amidi-plug/i_configure-dummy.c:329
+msgid "Dummy Backend not loaded or not available"
+msgstr "Le système de sortie 'Dummy' n'est pas chargé ou n'est pas disponible"
+
+#: src/amidi-plug/i_configure-dummy.c:348
+msgid ""
+"<span size=\"smaller\">Dummy\n"
+"backend</span>"
+msgstr ""
+"<span size=\"smaller\">Sortie\n"
+"'Dummy'</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:83
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "Choix du fichier 'SoundFont'"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:362
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "CONFIGURATION DU SYSTÈME DE SORTIE 'FLUIDSYNTH'"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "SoundFont settings"
+msgstr "Paramètres de la banque de sons 'SoundFont'"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:452
+msgid "Size (bytes)"
+msgstr "Taille (bytes)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:501
+msgid "Load SF on player start"
+msgstr "Charger la banque de sons au démarrage du lecteur"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:505
+msgid "Load SF on first midifile play"
+msgstr "Charger la banque de sons à la lecture du premier fichier MIDI"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:520
+msgid "Synthesizer settings"
+msgstr "Paramètres du synthétiseur"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:529
+msgid "gain"
+msgstr "Gain"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:535
+#: src/amidi-plug/i_configure-fluidsynth.c:563
+#: src/amidi-plug/i_configure-fluidsynth.c:591
+#: src/amidi-plug/i_configure-fluidsynth.c:622
+msgid "use default"
+msgstr "valeur par défaut"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:538
+#: src/amidi-plug/i_configure-fluidsynth.c:566
+msgid "value:"
+msgstr "valeur :"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:557
+msgid "poliphony"
+msgstr "Polyphonie"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:585
+msgid "reverb"
+msgstr "Réverbération"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:594
+#: src/amidi-plug/i_configure-fluidsynth.c:625
+msgid "yes"
+msgstr "Oui"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:596
+#: src/amidi-plug/i_configure-fluidsynth.c:627
+msgid "no"
+msgstr "Non"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:616
+msgid "chorus"
+msgstr "Effet de choeur"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:647
+msgid "sample rate"
+msgstr "Taux d'échantillonnage"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:653
+msgid "22050 Hz "
+msgstr "22050 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:656
+msgid "44100 Hz "
+msgstr "44100 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:659
+msgid "96000 Hz "
+msgstr "96000 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid "custom "
+msgstr "Autre "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:671
+msgid "Hz "
+msgstr "Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:705
+msgid "Buffer settings"
+msgstr "Paramètres du tampon"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:714
+msgid "<span size=\"smaller\">def</span>"
+msgstr "<span size=\"smaller\">Réinitialisation</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:723
+msgid "<span size=\"smaller\">handy buffer tuner</span>"
+msgstr "<span size=\"smaller\">Ajusteur de tampon pratique</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:737
+msgid "<span size=\"smaller\">size</span>"
+msgstr "<span size=\"smaller\">taille</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:751
+msgid "<span size=\"smaller\">margin</span>"
+msgstr "<span size=\"smaller\">marge</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:765
+msgid "<span size=\"smaller\">increment</span>"
+msgstr "<span size=\"smaller\">différentiel</span>"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:807
+msgid ""
+"* Select SoundFont files *\n"
+"In order to play MIDI with FluidSynth, you need to specify at least one valid SoundFont file here (use absolute paths). The loading order is from the top (first) to the bottom (last)."
+msgstr ""
+"* Sélectionner les fichier 'SoundFont' *\n"
+"Afin de pouvoir écouter des fichiers MIDI avec 'FluidSynth', vous devez spécifier au moins un fichier 'SoundFont' valide (veillez à utiliser des chemins absolus). Le chargement s'opère, par ordre, du haut (le premier fichier) vers le bas (le dernier fichier)."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:812
+msgid ""
+"* Load SoundFont on player start *\n"
+"Depending on your system speed, SoundFont loading in FluidSynth will require up to a few seconds. This is a one-time task (the soundfont will stay loaded until it is changed or the backend is unloaded) that can be done at player start, or before the first MIDI file is played (the latter is a better choice if you don't use your player to listen MIDI files only)."
+msgstr ""
+"* Charger la banque de sons au démarrage du lecteur *\n"
+"En fonction de la vitesse de votre système, le chargement du fichier 'SoundFont' dans 'FluidSynth' nécessitera quelques secondes. Cette opération, qui ne sera exécutée qu'une fois (la banque de sons restera en mémoire, jusqu'à ce qu'elle soit modifiée ou que le système de sortie ne soit supprimé de la mémoire), peut être accomplie au démarrage du lecteur, ou avant que ne soit lu le premier fichier MIDI (la seconde proposition constitue un meilleur choix, si vous n'utilisez pas le lecteur pour écouter des fichiers MIDI uniquement)."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:820
+msgid ""
+"* Load SoundFont on first midifile play *\n"
+"Depending on your system speed, SoundFont loading in FluidSynth will require up to a few seconds. This is a one-time task (the soundfont will stay loaded until it is changed or the backend is unloaded) that can be done at player start, or before the first MIDI file is played (the latter is a better choice if you don't use your player to listen MIDI files only)."
+msgstr ""
+"* Charger la banque de sons à la lecture du premier fichier MIDI *\n"
+"En fonction de la vitesse de votre système, le chargement du fichier 'SoundFont' dans 'FluidSynth' nécessitera quelques secondes. Cette opération, qui ne sera exécutée qu'une fois (la banque de sons restera en mémoire, jusqu'à ce qu'elle soit modifiée ou que le système de sortie ne soit supprimé de la mémoire), peut être accomplie au démarrage du lecteur, ou avant que ne soit lu le premier fichier MIDI (la seconde proposition constitue un meilleur choix, si vous n'utilisez pas le lecteur pour écouter des fichiers MIDI uniquement)."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:828
+msgid ""
+"* Synthesizer gain *\n"
+"From FluidSynth docs: the gain is applied to the final or master output of the synthesizer; it is set to a low value by default to avoid the saturation of the output when random MIDI files are played."
+msgstr ""
+"* Gain du synthétiseur *\n"
+"Selon la documentation de 'FluidSynth', le gain est appliqué à la sortie finale ou principale du synthétiseur. Par défaut, il est réglé sur une valeur basse, afin d'éviter la saturation de la sortie, lorsque des fichiers MIDI sont lus de manière aléatoire."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:833
+msgid ""
+"* Synthesizer polyphony *\n"
+"From FluidSynth docs: the polyphony defines how many voices can be played in parallel; the number of voices is not necessarily equivalent to the number of notes played simultaneously; indeed, when a note is struck on a specific MIDI channel, the preset on that channel may create several voices, for example, one for the left audio channel and one for the right audio channels; the number of voices activated depends on the number of instrument zones that fall in the correspond to the velocity and key of the played note."
+msgstr ""
+"* Polyphonie du synthétiseur *\n"
+"Selon la documentation de 'FluidSynth', la polyphonie définit le nombre de voix qui peuvent être jouées en parallèle ; le nombre de voix ne correspond pas nécessairement au nombre de notes jouées simultanément. En effet, lorsqu'une note est envoyée à un canal MIDI spécifique, le préréglage de ce canal peut créer plusieurs voix (par exemple, une voix pour le canal audio gauche et une autre pour le canal audio droit). Le nombre de voix activées dépend du nombre de pistes d'instruments relatives à la vélocité et à la tonalité de la note jouée."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:843
+#: src/amidi-plug/i_configure-fluidsynth.c:849
+msgid ""
+"* Synthesizer reverb *\n"
+"From FluidSynth docs: when set to \"yes\" the reverb effects module is activated; note that when the reverb module is active, the amount of signal sent to the reverb module depends on the \"reverb send\" generator defined in the SoundFont."
+msgstr ""
+"* Réverbération du synthétiseur *\n"
+"Selon la documentation de 'FluidSynth', lorsque l'option \"Oui\" est cochée, le module d'effet de réverbération est activé. Veuillez noter que, lorsque le module de réverbération est actif, la quantité de signaux envoyés au module dépend du générateur d'\"envoi de réverbération\" défini dans le fichier 'SoundFont'."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:855
+#: src/amidi-plug/i_configure-fluidsynth.c:861
+msgid ""
+"* Synthesizer chorus *\n"
+"From FluidSynth docs: when set to \"yes\" the chorus effects module is activated; note that when the chorus module is active, the amount of signal sent to the chorus module depends on the \"chorus send\" generator defined in the SoundFont."
+msgstr ""
+"* Effet de choeur du synthétiseur *\n"
+"Selon la documentation de 'FluidSynth', lorsque l'option \"Oui\" est cochée, le module d'effet de choeur est activé. Veuillez noter que, lorsque le module d'effet de choeur est actif, la quantité de signaux envoyés au module dépend du générateur d'\"envoi d'effet de choeur\" défini dans le fichier 'SoundFont'."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:867
+#: src/amidi-plug/i_configure-fluidsynth.c:873
+#: src/amidi-plug/i_configure-fluidsynth.c:879
+#: src/amidi-plug/i_configure-fluidsynth.c:885
+msgid ""
+"* Synthesizer samplerate *\n"
+"The sample rate of the audio generated by the synthesizer. You can also specify a custom value in the interval 22050Hz-96000Hz.\n"
+"NOTE: the default buffer parameters are tuned for 44100Hz; changing the sample rate may require buffer params tuning to obtain good sound quality."
+msgstr ""
+"* Taux d'échantillonnage du synthétiseur *\n"
+"Cette option définit le taux d'échantillonnage du flux audio produit par le synthétiseur. Vous pouvez aussi spécifier une valeur personnalisée, située dans l'intervalle 22050 - 96000 Hz.\n"
+"Veuillez noter que les paramètres du tampon par défaut sont optimisées pour 44100 Hz : modifier le taux d'échantillonnage peut nécessiter un réglage des paramètres du tampon, afin d'obtenir une bonne qualité audio."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:891
+msgid ""
+"* FluidSynth backend buffer *\n"
+"This button resets the backend buffer parameters to default values."
+msgstr ""
+"* Tampon du système de sortie 'FluidSynth' *\n"
+"Ce bouton réinitialise les paramètres du tampon aux valeurs par défaut."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:894
+msgid ""
+"* FluidSynth backend buffer *\n"
+"If you notice skips or slowness during song playback and your system is not performing any cpu-intensive task (except FluidSynth itself), you may want to adjust the buffer parameters. Try to move the \"handy buffer tuner\" some steps to the right until playback is fluid again."
+msgstr ""
+"* Tampon du système de sortie 'FluidSynth' *\n"
+"Si vous constatez des coupures ou des ralentissements lors de la lecture, alors que votre système n'exécute pas de tâche qui pourrait utiliser les ressources du processeur de manière intensive (hormis 'FluidSynth'), vous pouvez ajuster les paramètres du tampon. Essayez de déplacer l' \"ajusteur de tampon pratique\" vers la droite, de manière progressive, jusqu'à ce que la lecture soit à nouveau fluide."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:900
+#: src/amidi-plug/i_configure-fluidsynth.c:911
+#: src/amidi-plug/i_configure-fluidsynth.c:922
+msgid ""
+"* FluidSynth backend buffer *\n"
+"It is a good idea to make buffer adjustments with the \"handy buffer tuner\" before resorting to manual editing of buffer parameters.\n"
+"However, if you want to fine-tune something and want to know what you're doing, you can understand how these parameters work by reading the backend code (b-fluidsynth.c). In short words, every amount of time (proportional to buffer_SIZE and sample rate), right before gathering samples, the buffer is resized as follows:\n"
+"buffer_SIZE + buffer_MARGIN + extramargin\n"
+"where extramargin is a value computed as number_of_seconds_of_playback / margin_INCREMENT ."
+msgstr ""
+"* Tampon du système de sortie 'FluidSynth' *\n"
+"Il est judicieux de procéder à des réglages avec l'\"ajusteur de tampon pratique\" avant de procéder à l'édition manuelle des paramètres du tampon.\n"
+"Toutefois, si vous désirez obtenir des réglages plus précis et savoir ce que vous faites, vous pouvez comprendre comment fonctionnent ces paramètres en consultant le code du système de sortie ('b-fluidsynth.c'). En résumé, à chaque unité de temps, directement avant l'assemblage des échantillons, la taille du tampon est redéfinie de cette manière :\n"
+"buffer_SIZE (taille du tampon) + buffer_MARGIN (marge du tampon) + marge supplémentaire\n"
+"(la marge supplémentaire est la valeur calculée suivant l'opération suivante : nombre de secondes de lecture / différentiel de la marge"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:937
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Le système de sortie 'FluidSynth' n'est pas chargé ou n'est pas disponible"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:956
+msgid ""
+"<span size=\"smaller\">FluidSynth\n"
+"backend</span>"
+msgstr ""
+"<span size=\"smaller\">Sortie\n"
+"'FluidSynth'</span>"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "CONFIGURATION DU SYSTÈME DE SORTIE 'TIMIDITY'"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Le système de sortie 'TiMidity' n'est pas chargé ou n'est pas disponible"
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"<span size=\"smaller\">TiMidity\n"
+"backend</span>"
+msgstr ""
+"<span size=\"smaller\">Sortie\n"
+"'TiMidity'</span>"
+
+#: src/amidi-plug/i_fileinfo.c:169
+#: src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684
+#: src/vorbis/fileinfo.c:559
+msgid "Name:"
+msgstr "Nom :"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid "<span size=\"smaller\"> MIDI Info </span>"
+msgstr "<span size=\"smaller\"> Informations sur le fichier MIDI </span>"
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Format :"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Durée (msec) :"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "Nombre de pistes :"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "variable"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "BPM :"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg) :"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Division du temps :"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid "<span size=\"smaller\"> MIDI Comments and Lyrics </span>"
+msgstr "<span size=\"smaller\"> Commentaires et paroles du fichier MIDI </span>"
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* aucun commentaire n'est disponible dans ce fichier MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* aucune parole ne sont pas disponible dans ce fichier MIDI"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid "  (invalid UTF-8)"
+msgstr "  (format UTF-8 invalide)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "À propos de 'AMIDI-Plug'"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr ""
+"\n"
+"'AMIDI-Plug' "
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Lecteur de musique 'MIDI' modulaire\n"
+"\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Auteur : Giacomo Lozito < james@develia.org >\n"
+"\n"
+"\n"
+"Remerciements particuliers à...\n"
+"\n"
+"Clemens Ladisch et Jaroslav Kysela\n"
+"pour leurs excellents outils 'aplaymidi' et 'amixer' :\n"
+"ils étaient très utiles (en plus de la documentation\n"
+"relative à la bibliothèque 'ALSA') pour apprendre\n"
+"l'interface de programmation 'ALSA'.\n"
+"\n"
+"Alfredo Spadafina\n"
+"pour le beau logo (clavier MIDI).\n"
+"\n"
+"Tony Vroon\n"
+"pour son aide précieuse, lors de la phase alpha.\n"
+"\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rectangle"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Rectangle arrondi"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Rectangle concave"
+
+#: src/aosd/aosd_style.c:87
+#: src/hotkey/plugin.c:717
+msgid "None"
+msgstr "Aucun"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Début de la lecture"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Déclenche la fonction 'OSD' lorsqu'une entrée de la liste de lecture est lue."
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Changement de titre"
+
+#: src/aosd/aosd_trigger.c:80
+msgid "Triggers OSD when, during playback, the song title changes but the filename is the same. This is mostly useful to display title changes in internet streams."
+msgstr "Déclenche la fonction 'OSD' si, pendant la lecture, le titre du morceau change, alors que le nom du fichier est identique. Cette option est particulièrement utile pour afficher le changement de titre des flux Internet."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Volume Change"
+msgstr "Changement de volume"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when volume is changed."
+msgstr "Déclenche la fonction 'OSD' en cas de changement de volume."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause On"
+msgstr "Mode 'pause' activé"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is paused."
+msgstr "Déclenche la fonction 'OSD' lorsque la lecture est en mode 'pause'."
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Pause Off"
+msgstr "Mode 'pause' désactivé"
+
+#: src/aosd/aosd_trigger.c:97
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Déclenche la fonction 'OSD' lorsque la lecture n'est plus en mode 'pause'."
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Position"
+
+#: src/aosd/aosd_ui.c:202
+msgid "Relative X offset:"
+msgstr "Décalage horizontal :"
+
+#: src/aosd/aosd_ui.c:211
+msgid "Relative Y offset:"
+msgstr "Décalage vertical :"
+
+#: src/aosd/aosd_ui.c:220
+msgid "Max OSD width:"
+msgstr "Largeur maximale :"
+
+#: src/aosd/aosd_ui.c:233
+msgid "Multi-Monitor options"
+msgstr "Options de l'affichage multiple"
+
+#: src/aosd/aosd_ui.c:237
+msgid "Display OSD using:"
+msgstr "Afficher OSD sur :"
+
+#: src/aosd/aosd_ui.c:239
+msgid "all monitors"
+msgstr "tous les moniteurs"
+
+#: src/aosd/aosd_ui.c:242
+#, c-format
+msgid "monitor %i"
+msgstr "moniteur %i"
+
+#: src/aosd/aosd_ui.c:295
+msgid "Timing (ms)"
+msgstr "Durée (ms)"
+
+#: src/aosd/aosd_ui.c:300
+msgid "Display:"
+msgstr "Affichage :"
+
+#: src/aosd/aosd_ui.c:305
+msgid "Fade in:"
+msgstr "Fondu d'entrée :"
+
+#: src/aosd/aosd_ui.c:310
+msgid "Fade out:"
+msgstr "Fondu de sortie :"
+
+#: src/aosd/aosd_ui.c:391
+msgid "Fonts"
+msgstr "Polices"
+
+#: src/aosd/aosd_ui.c:399
+#, c-format
+msgid "Font %i:"
+msgstr "Police %i :"
+
+#: src/aosd/aosd_ui.c:416
+msgid "Shadow"
+msgstr "Ombre"
+
+#: src/aosd/aosd_ui.c:451
+msgid "Internationalization"
+msgstr "Internationalisation"
+
+#: src/aosd/aosd_ui.c:457
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Désactiver la conversion UTF-8 du texte (dans le module 'aOSD')"
+
+#: src/aosd/aosd_ui.c:475
+msgid "Select Skin File"
+msgstr "Choisir un fichier de thème"
+
+#: src/aosd/aosd_ui.c:586
+msgid "Render Style"
+msgstr "Style du rendu"
+
+#: src/aosd/aosd_ui.c:602
+msgid "Colors"
+msgstr "Couleurs"
+
+#: src/aosd/aosd_ui.c:615
+#, c-format
+msgid "Color %i:"
+msgstr "Couleur %i:"
+
+#: src/aosd/aosd_ui.c:635
+msgid "Custom Skin"
+msgstr "Thème personnalisé"
+
+#: src/aosd/aosd_ui.c:641
+msgid "Skin file:"
+msgstr "Fichier du thème"
+
+#: src/aosd/aosd_ui.c:644
+#: src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856
+#: src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010
+#: src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
+msgid "Browse"
+msgstr "Parcourir"
+
+#: src/aosd/aosd_ui.c:746
+msgid "Enable trigger"
+msgstr "Activer le déclencheur"
+
+#: src/aosd/aosd_ui.c:773
+msgid "Event"
+msgstr "Événement"
+
+#: src/aosd/aosd_ui.c:801
+msgid "Composite manager detected"
+msgstr "Gestionnaire composite détecté"
+
+#: src/aosd/aosd_ui.c:808
+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 ""
+"Aucun gestionnaire composite n'a été détecté. À moins que vous ne soyez certain d'utiliser un tel gestionnaire,\n"
+"veuillez activer un gestionnaire composite approprié. Sinon, l'affichage 'OSD' ne fonctionnera pas correctement."
+
+#: src/aosd/aosd_ui.c:816
+msgid "Composite manager not required for fake transparency"
+msgstr "La fausse transparence ne nécessite pas de gestionnaire composite."
+
+#: src/aosd/aosd_ui.c:854
+msgid "Transparency"
+msgstr "Transparence"
+
+#: src/aosd/aosd_ui.c:860
+msgid "Fake transparency"
+msgstr "Fausse transparence"
+
+#: src/aosd/aosd_ui.c:862
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Véritable transparence (nécessite l'extension 'composite' de X)"
+
+#: src/aosd/aosd_ui.c:904
+msgid "Composite extension not loaded"
+msgstr "L'extension 'composite' n'est pas chargée"
+
+#: src/aosd/aosd_ui.c:912
+msgid "Composite extension not available"
+msgstr "L'extension 'composite' n'est pas disponible"
+
+#: src/aosd/aosd_ui.c:934
+#, c-format
+msgid "<span font_desc='%s'>Audacious OSD</span>"
+msgstr "<span font_desc='%s'>Audacious OSD</span>"
+
+#: src/aosd/aosd_ui.c:1015
+msgid "Audacious OSD - configuration"
+msgstr "Configuration de 'Audacious OSD'"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Test"
+msgstr "Essai"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Position"
+msgstr "Arrangement"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Animation"
+msgstr "Animation"
+
+#: src/aosd/aosd_ui.c:1061
+msgid "Text"
+msgstr "Texte"
+
+#: src/aosd/aosd_ui.c:1066
+msgid "Decoration"
+msgstr "Décoration"
+
+#: src/aosd/aosd_ui.c:1071
+msgid "Trigger"
+msgstr "Déclenchement"
+
+#: src/aosd/aosd_ui.c:1076
+#: src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026
+#: src/sid/xs_interface.c:1229
+msgid "Misc"
+msgstr "Divers"
+
+#: src/aosd/aosd_ui.c:1113
+msgid "Audacious OSD - about"
+msgstr "À propos de 'OSD' pour Audacious"
+
+#: src/aosd/aosd_ui.c:1143
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr ""
+"\n"
+"'OSD' pour Audacious "
+
+#: src/aosd/aosd_ui.c:1144
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Écrit par Giacomo Lozito < james@develia.org >\n"
+"\n"
+"'On-Screen-Display' est basé sur la bibliothèque 'Ghosd' de Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+
+#: src/arts/arts.c:22
+msgid "About aRts Output"
+msgstr "À propos du pilote 'aRts'"
+
+#: src/arts/arts.c:23
+msgid ""
+"aRts output plugin by Håvard Kvålen <havardk@xmms.org>\n"
+"Audacious port by Giacomo Lozito from develia.org"
+msgstr ""
+"Le module de sortie 'aRts' a été écrit par\n"
+"\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"\n"
+"\n"
+"Le rétroportage pour Audacious  a été effectué par\n"
+"\n"
+"Giacomo Lozito, de 'develia.org'"
+
+#: src/arts/configure.c:50
+msgid "aRts Driver configuration"
+msgstr "Configuration du pilote 'aRts'"
+
+#: src/arts/configure.c:61
+#: src/esd/configure.c:171
+#: src/OSS4/configure.c:232
+#: src/OSS/configure.c:304
+#: src/sun/configure.c:259
+msgid "Buffering:"
+msgstr "Tampon"
+
+#: src/arts/configure.c:73
+#: src/esd/configure.c:184
+#: src/OSS4/configure.c:245
+#: src/OSS/configure.c:317
+#: src/sun/configure.c:272
+msgid "Buffer size (ms):"
+msgstr "Taille du tampon (ms) :"
+
+#: src/arts/configure.c:83
+#: src/esd/configure.c:209
+#: src/OSS4/configure.c:270
+#: src/OSS/configure.c:342
+#: src/sun/configure.c:304
+msgid "Buffering"
+msgstr "Tampon"
+
+#: src/audiocompress/audacious-glue.c:95
+msgid "AudioCompress "
+msgstr "AudioCompress "
+
+#: src/audiocompress/audacious-glue.c:96
+msgid ""
+"\n"
+"(c)2003 trikuare studios(http://trikuare.cx)\n"
+"Ported to Audacious by Tony Vroon (chainsaw@gentoo.org)\n"
+"\n"
+"Simple dynamic range compressor for transparently\n"
+"keeping the volume level more or less consistent"
+msgstr ""
+"\n"
+"\n"
+"Droits d'utilisation (2003) : Trikuare Studios (http://trikuare.cx)\n"
+"\n"
+"Rétroporté pour Audacious par Tony Vroon (chainsaw@gentoo.org)\n"
+"\n"
+"\n"
+"'AudioCompress' est un compresseur dynamique simple conçu\n"
+"pour maintenir, de manière transparente, le volume à un niveau\n"
+"plus ou moins uniforme."
+
+#: src/audiocompress/audacious-glue.c:101
+msgid "About AudioCompress"
+msgstr "À propos de 'AudioCompress'"
+
+#: src/audiocompress/audacious-glue.c:320
+msgid "If checked, when the sound peaks the volume will be cut instantly; otherwise, it will ramp down just in time for the peak (but some minor clipping may still occur)."
+msgstr "Si cette option est activée, en cas de pic sonore, le volume sera immédiatement coupé ; sinon, il diminuera juste à temps, de manière à éviter le pic (malgré tout, une saturation faible peut survenir)."
+
+#: src/audiocompress/audacious-glue.c:324
+msgid "The maximum amount to amplify the audio by"
+msgstr "Détermine l'amplification maximale à appliquer au flux audio."
+
+#: src/audiocompress/audacious-glue.c:326
+msgid "Defines how smoothly the volume will ramp up"
+msgstr "Détermine la vitesse à laquelle le volume sera réduit. Une valeur élevée correspond à une vitesse plus lente."
+
+#: src/audiocompress/audacious-glue.c:328
+msgid "The target audio level for ramping up. Lowering the value gives a bit more dynamic range for peaks, but will make the overall sound quieter."
+msgstr "Détermine le niveau sonore à partir duquel la compression sera appliquée. Des valeurs faibles permettent d'obtenir une variation des pics plus dynamique, mais rendent l'ensemble du flux moins audible."
+
+#: src/audiocompress/audacious-glue.c:331
+msgid "How long of a window to maintain"
+msgstr "Temps de relâchement (ms) :"
+
+#: src/audiocompress/audacious-glue.c:372
+msgid "AudioCompress preferences"
+msgstr "Préférences de 'AudioCompress'"
+
+#: src/audiocompress/audacious-glue.c:389
+msgid " Quality Options "
+msgstr " Qualité "
+
+#: src/audiocompress/audacious-glue.c:394
+msgid " Aggressively prevent clipping"
+msgstr " Prévention agressive de la saturation "
+
+#: src/audiocompress/audacious-glue.c:406
+msgid " Target & gain"
+msgstr " Seuil & Gain"
+
+#: src/audiocompress/audacious-glue.c:417
+msgid "Target audio level:"
+msgstr "Seuil de compression :"
+
+#: src/audiocompress/audacious-glue.c:425
+msgid "Maximum gain:"
+msgstr "Gain maximal :"
+
+#: src/audiocompress/audacious-glue.c:433
+msgid "Gain smooth:"
+msgstr "Vitesse du gain :"
+
+#: src/audiocompress/audacious-glue.c:485
+msgid " History "
+msgstr " Relâchement "
+
+#: src/audiocompress/audacious-glue.c:517
+msgid "How long of a history to maintain.  A higher number will make the volume changes less responsive."
+msgstr "Détermine la durée (exprimée en millisecondes) pendant laquelle la compression sera appliquée."
+
+#: src/audiocompress/audacious-glue.c:528
+msgid "Load default values"
+msgstr "Charger les valeurs par défaut"
+
+#: src/audiocompress/audacious-glue.c:533
+msgid "Audio values"
+msgstr "Paramètres audio"
+
+#: src/audiocompress/audacious-glue.c:562
+#: src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698
+#: src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
+msgid "Apply"
+msgstr "Appliquer"
+
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Montrer les décorations"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
+#: src/blur_scope/blur_scope.c:57
+msgid "/Close"
+msgstr "/Fermer"
+
+#: src/blur_scope/blur_scope.c:181
+msgid "Blur scope"
+msgstr "'Blur Scope'"
+
+#: src/blur_scope/config.c:72
+msgid "Blur Scope: Color selection"
+msgstr "'Blur Scope' : sélection de la couleur"
+
+#: src/blur_scope/config.c:82
+#: src/jack/configure.c:108
+msgid "Options:"
+msgstr "Options :"
+
+#: src/cdaudio-ng/cdaudio-ng.c:187
+msgid "Add CD"
+msgstr "Ajouter un CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:212
+msgid "About CD Audio Plugin NG"
+msgstr "À propos du module 'CD Audio NG'"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+"Droits d'utilisation (2007) :\n"
+"\n"
+"Calin Crisan <ccrisan@gmail.com>\n"
+"Équipe de développement Audacious.\n"
+"\n"
+"Remerciements cordiaux aux développeurs de :\n"
+"\n"
+"'libcdio'  <http://www.gnu.org/software/libcdio/>\n"
+"'libcddb' <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Je remercie également Tony Vroon de m'avoir guidé et soutenu.\n"
+"\n"
+"Ce module était un projet de 'Google Summer of Code 2007'."
+
+#: src/cdaudio-ng/cdaudio-ng.c:802
+msgid ""
+"<b><big>No playable CD found.</big></b>\n"
+"\n"
+"No CD inserted, or inserted CD is not an audio CD.\n"
+msgstr ""
+"<b><big>Aucune piste audio n'a été détectée.</big></b>\n"
+"\n"
+"Le lecteur ne comporte pas de CD ou le support inséré n'est pas un CD audio.\n"
+
+#: src/cdaudio-ng/configure.c:129
+msgid "CD Audio Plugin Configuration"
+msgstr "Configuration du module 'CD Audio'"
+
+#: src/cdaudio-ng/configure.c:139
+msgid "Digital audio extraction"
+msgstr "Extraction audio digitale"
+
+#: src/cdaudio-ng/configure.c:144
+msgid "Title information"
+msgstr "Informations sur le titre"
+
+#: src/cdaudio-ng/configure.c:161
+msgid "Limit read speed to: "
+msgstr "Limiter la vitesse de lecture à : "
+
+#: src/cdaudio-ng/configure.c:168
+msgid "Use cd-text if available"
+msgstr "Utiliser CD-TEXT, si la fonction est disponible"
+
+#: src/cdaudio-ng/configure.c:172
+msgid "Use CDDB if available"
+msgstr "Utiliser CDDB, si le service est disponible"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Server: "
+msgstr "Serveur : "
+
+#: src/cdaudio-ng/configure.c:179
+msgid "Port: "
+msgstr "Port : "
+
+#: src/cdaudio-ng/configure.c:189
+msgid "Override default device: "
+msgstr "Remplacer le périphérique par défaut : "
+
+#: src/cdaudio-ng/configure.c:196
+msgid "Print debug information"
+msgstr "Afficher les informations de débogage"
+
+#: src/console/Audacious_Config.cxx:125
+msgid "Console Music Decoder"
+msgstr "Décodeur 'Console Music'"
+
+#: src/console/Audacious_Config.cxx:162
+msgid "Bass:"
+msgstr "Basses :"
+
+#: src/console/Audacious_Config.cxx:166
+#: src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
+msgid "secs"
+msgstr "secondes"
+
+#: src/console/Audacious_Config.cxx:173
+msgid "Treble:"
+msgstr "Aiguës :"
+
+#: src/console/Audacious_Config.cxx:194
+msgid "Default song length:"
+msgstr "Durée par défaut :"
+
+#: src/console/Audacious_Config.cxx:200
+#: src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338
+#: src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
+msgid "Resampling"
+msgstr "Rééchantillonnage"
+
+#: src/console/Audacious_Config.cxx:206
+msgid "Enable audio resampling"
+msgstr "Activer le rééchantillonnage"
+
+#: src/console/Audacious_Config.cxx:221
+msgid "Resampling rate:"
+msgstr "Taux de rééchantillonnage"
+
+#: src/console/Audacious_Config.cxx:236
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/Audacious_Config.cxx:237
+msgid "Ignore length from SPC tags"
+msgstr "Ignorer la durée des métadonnées SPC"
+
+#: src/console/Audacious_Config.cxx:238
+msgid "Increase reverb"
+msgstr "Augmenter la réverbération"
+
+#: src/console/Audacious_Config.cxx:263
+msgid "The default song length, expressed in seconds, is used for songs that do not provide length information (i.e. looping tracks)."
+msgstr ""
+"* Durée par défaut *\n"
+"La durée par défaut, exprimée en secondes, est utilisée pour les morceaux qui ne disposent pas d'informations quant à leur durée (les pistes en boucle, par exemple)."
+
+#: src/console/Audacious_Driver.cxx:444
+msgid "About the Console Music Decoder"
+msgstr "À propos de 'Console Music Decoder'"
+
+#: src/console/Audacious_Driver.cxx:445
+msgid ""
+"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"
+"Audacious implementation by: William Pitcock <nenolod@nenolod.net>, \n"
+"        Shay Green <gblargg@gmail.com>"
+msgstr ""
+"Le moteur de 'Console Music Decoder' est basé sur 'Game_Music_Emu' 0.5.2.\n"
+"\n"
+"Formats supportés : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Support pour Audacious par :\n"
+"\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/echo_plugin/gui.c:11
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr ""
+"Module 'Écho'\n"
+"\n"
+"Écrit par Johan Levin (1999).\n"
+"\n"
+"'Surround echo' est écrit par Carl van Schaik (1999)"
+
+#: src/echo_plugin/gui.c:25
+msgid "About Echo Plugin"
+msgstr "À propos du module 'Écho'"
+
+#: src/echo_plugin/gui.c:76
+msgid "Configure Echo"
+msgstr "Configuration de 'Écho'"
+
+#: src/echo_plugin/gui.c:89
+msgid "Delay: (ms)"
+msgstr "Délai : (ms)"
+
+#: src/echo_plugin/gui.c:94
+msgid "Feedback: (%)"
+msgstr "Retour : (%)"
+
+#: src/echo_plugin/gui.c:99
+msgid "Volume: (%)"
+msgstr "Volume : (%)"
+
+#: src/echo_plugin/gui.c:122
+msgid "Surround echo"
+msgstr "Écho d'ambiance"
+
+#: src/esd/about.c:34
+msgid "About ESounD Plugin"
+msgstr "À propos du module 'ESounD'"
+
+#: src/esd/about.c:35
+msgid ""
+"Audacious ESounD 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."
+msgstr ""
+"Module 'EsounD' pour Audacious\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/esd/configure.c:102
+msgid "ESD Output Plugin configuration"
+msgstr "Configuration du module de sortie 'ESD'"
+
+#: src/esd/configure.c:114
+#: src/esd/configure.c:144
+msgid "Host:"
+msgstr "Hôte :"
+
+#: src/esd/configure.c:125
+msgid "Use remote host"
+msgstr "Utiliser un hôte distant"
+
+#: src/esd/configure.c:132
+msgid "Volume controls OSS mixer"
+msgstr "Utiliser le contrôle du volume du mélangeur OSS"
+
+#: src/esd/configure.c:153
+msgid "Port:"
+msgstr "Port :"
+
+#: src/esd/configure.c:169
+msgid "Server"
+msgstr "Serveur"
+
+#: src/esd/configure.c:198
+#: src/OSS4/configure.c:259
+#: src/OSS/configure.c:331
+#: src/sun/configure.c:290
+msgid "Pre-buffer (percent):"
+msgstr "Pré-tampon (pourcents) :"
+
+#: src/evdev-plug/ed.c:59
+msgid "Playback->Play"
+msgstr "Lecture -> Lire"
+
+#: src/evdev-plug/ed.c:60
+msgid "Playback->Stop"
+msgstr "Lecture -> Arrêter"
+
+#: src/evdev-plug/ed.c:61
+msgid "Playback->Pause"
+msgstr "Lecture -> Pause"
+
+#: src/evdev-plug/ed.c:62
+msgid "Playback->Prev"
+msgstr "Lecture -> Précédent"
+
+#: src/evdev-plug/ed.c:63
+msgid "Playback->Next"
+msgstr "Lecture -> Suivant"
+
+#: src/evdev-plug/ed.c:64
+msgid "Playback->Eject"
+msgstr "Lecture -> Éjecter"
+
+#: src/evdev-plug/ed.c:66
+msgid "Playlist->Repeat"
+msgstr "Liste de lecture -> Répéter"
+
+#: src/evdev-plug/ed.c:67
+msgid "Playlist->Shuffle"
+msgstr "Liste de lecture -> Aléatoire"
+
+#: src/evdev-plug/ed.c:69
+msgid "Volume->Up_5"
+msgstr "Volume -> Augmenter de 5"
+
+#: src/evdev-plug/ed.c:70
+msgid "Volume->Down_5"
+msgstr "Volume -> Diminuer de 5"
+
+#: src/evdev-plug/ed.c:71
+msgid "Volume->Up_10"
+msgstr "Volume -> Augmenter de 10"
+
+#: src/evdev-plug/ed.c:72
+msgid "Volume->Down_10"
+msgstr "Volume -> Diminuer de 10"
+
+#: src/evdev-plug/ed.c:73
+msgid "Volume->Mute"
+msgstr "Volume -> Couper"
+
+#: src/evdev-plug/ed.c:75
+msgid "Window->Main"
+msgstr "Fenêtre -> Principale"
+
+#: src/evdev-plug/ed.c:76
+msgid "Window->Playlist"
+msgstr "Fenêtre -> Liste de lecture"
+
+#: src/evdev-plug/ed.c:77
+msgid "Window->Equalizer"
+msgstr "Fenêtre -> Égaliseur"
+
+#: src/evdev-plug/ed.c:78
+msgid "Window->JumpToFile"
+msgstr "Fenêtre -> Aller au titre..."
+
+#: src/evdev-plug/ed_internals.c:93
+#, c-format
+msgid "event-device-plugin: unable to open device file %s , skipping this device; check that the file exists and that you have read permission for it\n"
+msgstr "Module 'Event-Device' : impossible d'ouvrir le fichier de périphérique %s ; le périphérique sera ignoré...Veuillez vérifier que le fichier existe et que disposez des permissions de lecture requises.\n"
+
+#: src/evdev-plug/ed_internals.c:102
+#, c-format
+msgid "event-device-plugin: unable to create a io_channel for device file %s ,skipping this device\n"
+msgstr "Module 'Event-Device' : impossible de créer un canal 'io' pour le fichier de périphérique %s ; le périphérique sera ignoré...\n"
+
+#: src/evdev-plug/ed_internals.c:339
+msgid "event-device-plugin: unable to open /proc/bus/input/devices , automatic detection of event devices won't work.\n"
+msgstr "Module 'Event-Device' : impossible d'ouvrir '/proc/bus/input/devices' ; la détection automatique des périphériques échouera...\n"
+
+#: src/evdev-plug/ed_internals.c:348
+msgid "event-device-plugin: unable to open a io_channel for /proc/bus/input/devices , automatic detection of event devices won't work.\n"
+msgstr "Module 'Event-Device' : impossible de créer un canal 'io' pour '/proc/bus/input/devices' ; la détection automatique des périphériques échouera...\n"
+
+#: src/evdev-plug/ed_internals.c:358
+msgid "event-device-plugin: an error occurred while reading /proc/bus/input/devices , automatic detection of event devices won't work.\n"
+msgstr "Module 'Event-Device' : une erreur s'est produite lors de lecture de '/proc/bus/input/devices' ; la détection automatique des périphériques échouera...\n"
+
+#: src/evdev-plug/ed_internals.c:421
+#, c-format
+msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+msgstr "Module 'Event-Device' : le périphérique %s n'a pas été trouvé dans '/dev/input' ; le périphérique sera ignoré...\n"
+
+#: src/evdev-plug/ed_internals.c:486
+#: src/evdev-plug/ed_internals.c:580
+#, c-format
+msgid "event-device-plugin: unable to load config file %s , default settings will be used.\n"
+msgstr "Module 'Event-Device' : impossible de charger le fichier de configuration %s ; les paramètres par défaut seront utilisés...\n"
+
+#: src/evdev-plug/ed_internals.c:532
+#, c-format
+msgid "event-device-plugin: incomplete information in config file for device \"%s\" , skipping.\n"
+msgstr "Module 'Event-Device' : information incomplète au sujet du périphérique \"%s\" ; le périphérique sera ignoré...\n"
+
+#: src/evdev-plug/ed_internals.c:601
+#: src/evdev-plug/ed_internals.c:933
+#, c-format
+msgid "event-device-plugin: configuration, unable to get is_active value for device \"%s\", skipping it.\n"
+msgstr "Module 'Event-Device' : impossible d'obtenir la valeur de 'is_active' dans le fichier de configuration pour le périphérique  \"%s\" ; le périphérique sera ignoré...\n"
+
+#: src/evdev-plug/ed_internals.c:837
+#, c-format
+msgid "event-device-plugin: unable to access local directory %s , settings will not be saved.\n"
+msgstr "Module 'Event-Device' : impossible d'accéder au dossier local %s ; les paramètres ne seront pas enregistrés...\n"
+
+#: src/evdev-plug/ed_internals.c:887
+#, c-format
+msgid "event-device-plugin: configuration, unable to get filename value for device \"%s\", skipping it.\n"
+msgstr "Module 'Event-Device' : impossible d'obtenir, dans le fichier de configuration, le nom du fichier du périphérique \"%s\" ;le périphérique sera ignoré...\n"
+
+#: src/evdev-plug/ed_internals.c:903
+#, c-format
+msgid "event-device-plugin: configuration, unable to get phys value for device \"%s\", skipping it.\n"
+msgstr "event-device-plugin : configuration ; impossible d'obtenir la valeur physique du périphérique \"%s\" ; opération ignorée.\n"
+
+#: src/evdev-plug/ed_internals.c:919
+#, c-format
+msgid "event-device-plugin: configuration, unable to get is_custom value for device \"%s\", skipping it.\n"
+msgstr "event-device-plugin : configuration ; impossible d'obtenir la valeur \"is_custom\" pour le périphérique \"%s\" ; opération ignorée.\n"
+
+#: src/evdev-plug/ed_internals.c:943
+#, c-format
+msgid "event-device-plugin: configuration, unexpected value for device \"%s\", skipping it.\n"
+msgstr "event-device-plugin : configuration ; valeur inattendue pour le périphérique  \"%s\" ; opération ignorée.\n"
+
+#: src/evdev-plug/ed_ui.c:274
+#: src/evdev-plug/ed_ui.c:410
+#: src/evdev-plug/ed_ui.c:872
+msgid "Information"
+msgstr "Information"
+
+#: src/evdev-plug/ed_ui.c:275
+msgid ""
+"Cannot open bindings window for a not-detected device.\n"
+"Ensure that the device has been correctly plugged in."
+msgstr ""
+"Il n'est pas possible d'ouvrir la fenêtre des associations pour un périphérique qui n'a pas été détecté.\n"
+"Veuillez vous assurer que le périphérique a été correctement branché."
+
+#: src/evdev-plug/ed_ui.c:318
+#: src/madplug/plugin.c:619
+msgid "Error"
+msgstr "Erreur"
+
+#: src/evdev-plug/ed_ui.c:319
+msgid ""
+"Unable to open selected device.\n"
+"Please check read permissions on device file."
+msgstr ""
+"Impossible d'ouvrir le périphérique sélectionné.\n"
+"Veuillez vérifier les permissions de lecture du fichier du périphérique."
+
+#: src/evdev-plug/ed_ui.c:340
+msgid "EvDev-Plug - Add custom device"
+msgstr "Ajouter un périphérique personnalisé"
+
+#: src/evdev-plug/ed_ui.c:352
+msgid ""
+"EvDev-Plug tries to automatically detect and update information about\n"
+"event devices available on the system.\n"
+"However, if auto-detect doesn't work for your system, or you have event\n"
+"devices in a non-standard location (currently they're only searched in\n"
+"/dev/input/ ), you may want to add a custom device, explicitly specifying\n"
+"name and device file."
+msgstr ""
+"'EvDev-Plug' essaye de détecter et de mettre à jour automatiquement\n"
+"les informations concernant les périphériques disponibles sur le système.\n"
+"Toutefois, si la détection automatique ne fonctionne pas pour votre\n"
+"système, ou si les périphériques ne sont pas installés dans un emplacement\n"
+"standard, vous pouvez ajouter un périphérique personnalisé, en spécifiant\n"
+"de manière précise le nom et le fichier du périphérique."
+
+#: src/evdev-plug/ed_ui.c:360
+msgid "Device name:"
+msgstr "Nom du périphérique :"
+
+#: src/evdev-plug/ed_ui.c:364
+msgid "Device file:"
+msgstr "Fichier du périphérique :"
+
+#: src/evdev-plug/ed_ui.c:411
+msgid ""
+"Please specify both name and filename.\n"
+"Filename must be specified with absolute path."
+msgstr ""
+"Veuillez spécifier à la fois le nom du périphérique et le nom du fichier.\n"
+"Le nom du fichier doit être déterminé par le chemin absolu."
+
+#: src/evdev-plug/ed_ui.c:446
+msgid "Do you want to remove the existing configuration for selected device?\n"
+msgstr "Voulez-vous supprimer la configuration du périphérique sélectionné ?\n"
+
+#: src/evdev-plug/ed_ui.c:465
+msgid "Do you want to remove the selected custom device?\n"
+msgstr "Voulez-vous supprimer le périphérique personnalisé sélectionné ?\n"
+
+#: src/evdev-plug/ed_ui.c:612
+msgid "EvDev-Plug - Configuration"
+msgstr "Configuration de 'EvDev-Plug'"
+
+#: src/evdev-plug/ed_ui.c:651
+msgid "Active"
+msgstr "Actif"
+
+#: src/evdev-plug/ed_ui.c:655
+#: src/sun/configure.c:488
+msgid "Status"
+msgstr "Statut"
+
+#: src/evdev-plug/ed_ui.c:664
+msgid "Device Name"
+msgstr "Nom du périphérique"
+
+#: src/evdev-plug/ed_ui.c:668
+msgid "Device File"
+msgstr "Fichier du périphérique"
+
+#: src/evdev-plug/ed_ui.c:672
+msgid "Device Address"
+msgstr "Adresse du périphérique"
+
+#: src/evdev-plug/ed_ui.c:689
+msgid "_Bindings"
+msgstr "_Associations"
+
+#: src/evdev-plug/ed_ui.c:836
+msgid ""
+"Press a key of your device to bind it;\n"
+"if no key is pressed in five seconds, this window\n"
+"will close without binding changes."
+msgstr ""
+"Appuyez sur une touche de votre périphérique pour l'associer.\n"
+"Si aucune touche n'a été pressée avant cinq secondes, cette\n"
+"fenêtre se fermera et aucun changement ne sera effectué."
+
+#: src/evdev-plug/ed_ui.c:873
+msgid ""
+"This input event has been already assigned.\n"
+"\n"
+"It's not possible to assign multiple actions to the same input event (although it's possible to assign the same action to multiple events)."
+msgstr ""
+"Cet événement a déjà été assigné.\n"
+"\n"
+"Il n'est pas possible d'associer des plusieurs actions au même événement (cepndant, il est possible d'attribuer la même action à plusieurs événements)."
+
+#: src/evdev-plug/ed_ui.c:1322
+msgid "EvDev-Plug - Bindings Configuration"
+msgstr "Configuration des associations"
+
+#: src/evdev-plug/ed_ui.c:1362
+msgid "<b>Name: </b>"
+msgstr "<b>Nom : </b>"
+
+#: src/evdev-plug/ed_ui.c:1371
+msgid "<b>Filename: </b>"
+msgstr "<b>Nom du fichier : </b>"
+
+#: src/evdev-plug/ed_ui.c:1380
+msgid "<b>Phys.Address: </b>"
+msgstr "<b>Adresse physique : </b>"
+
+#: src/evdev-plug/ed_ui.c:1459
+msgid "EvDev-Plug - about"
+msgstr "À propos de 'EvDev-Plug'"
+
+#: src/evdev-plug/ed_ui.c:1490
+msgid ""
+"\n"
+"player remote control via event devices\n"
+"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+msgstr ""
+"\n"
+"\n"
+"Cette extension permet de contrôler le lecteur à distance,\n"
+"par l'intermédiaire des événements des périphériques.\n"
+"\n"
+"http://www.develia.org/projects.php?p=evdevplug\n"
+"\n"
+"Écrit par Giacomo Lozito < james@develia.org >\n"
+"\n"
+
+#: src/filewriter/filewriter.c:163
+msgid "About FileWriter-Plugin"
+msgstr "À propos du module 'FileWriter'"
+
+#: src/filewriter/filewriter.c:164
+msgid ""
+"FileWriter-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
+"USA."
+msgstr ""
+"Module 'FileWriter'\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/filewriter/filewriter.c:476
+msgid "File Writer Configuration"
+msgstr "Configuration de 'File Writer'"
+
+#: src/filewriter/filewriter.c:488
+msgid "Output file format:"
+msgstr "Format du fichier de sortie :"
+
+#: src/filewriter/filewriter.c:506
+#: src/ladspa/ladspa.c:960
+msgid "Configure"
+msgstr "Configurer"
+
+#: src/filewriter/filewriter.c:521
+msgid "Save into original directory"
+msgstr "Enregistrer dans le répertoire d'origine"
+
+#: src/filewriter/filewriter.c:526
+msgid "Save into custom directory"
+msgstr "Enregistrer dans un répertoire personnel"
+
+#: src/filewriter/filewriter.c:538
+msgid "Output file folder:"
+msgstr "Dossier de destination :"
+
+#: src/filewriter/filewriter.c:542
+msgid "Pick a folder"
+msgstr "Choix d'un répertoire"
+
+#: src/filewriter/filewriter.c:562
+msgid "Get filename from:"
+msgstr "Déterminer le nom du fichier à partir :"
+
+#: src/filewriter/filewriter.c:565
+msgid "original file tags"
+msgstr "des métadonnées du fichier d'origine"
+
+#: src/filewriter/filewriter.c:571
+msgid "original filename"
+msgstr "du nom du fichier d'origine"
+
+#: src/filewriter/filewriter.c:581
+msgid "Don't strip file name extension"
+msgstr "Conserver l'extension du nom de fichier"
+
+#: src/filewriter/filewriter.c:585
+msgid "If enabled, the extension from the original filename will not be stripped before adding the new file extension to the end."
+msgstr "Si cette option est activée, l'extension du nom du fichier source ne sera pas supprimée avant l'ajout de la nouvelle extension."
+
+#: src/filewriter/filewriter.c:599
+msgid "Prepend track number to filename"
+msgstr "Ajouter le numéro de la piste au début du nom du fichier"
+
+#: src/filewriter/mp3.c:675
+msgid "MP3 Configuration"
+msgstr "Configuration de l'encodeur MP3"
+
+#: src/filewriter/mp3.c:702
+msgid "Algorithm Quality:"
+msgstr "Qualité de l'algorithme :"
+
+#: src/filewriter/mp3.c:724
+msgid ""
+"best/slowest:0;\n"
+"worst/fastest:9;\n"
+"recommended:2;\n"
+"default:5;"
+msgstr ""
+"meilleur / le plus lent : 0\n"
+"pire / le plus rapide : 9\n"
+"recommandé : 2\n"
+"défaut : 5"
+
+#: src/filewriter/mp3.c:732
+msgid "Output Samplerate:"
+msgstr "Taux d'échantillonnage de sortie :"
+
+#: src/filewriter/mp3.c:743
+#: src/filewriter/mp3.c:884
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:777
+msgid "Bitrate / Compression ratio:"
+msgstr "Débit / Taux de compression :"
+
+#: src/filewriter/mp3.c:803
+msgid "Bitrate (kbps):"
+msgstr "Débit (kbps)"
+
+#: src/filewriter/mp3.c:844
+msgid "Compression ratio:"
+msgstr "Taux de compression :"
+
+#: src/filewriter/mp3.c:874
+msgid "Audio Mode:"
+msgstr "Mode audio :"
+
+#: src/filewriter/mp3.c:889
+msgid "Joint-Stereo"
+msgstr "Stéréo jointe"
+
+#: src/filewriter/mp3.c:930
+msgid "auto-M/S mode"
+msgstr "Mode mono/stéréo automatique"
+
+#: src/filewriter/mp3.c:942
+msgid "Misc:"
+msgstr "Divers :"
+
+#: src/filewriter/mp3.c:953
+msgid "Enforce strict ISO complience"
+msgstr "Forcer le respect strict des normes ISO"
+
+#: src/filewriter/mp3.c:964
+msgid "Error protection"
+msgstr "Protection contre les erreurs"
+
+#: src/filewriter/mp3.c:976
+msgid "Adds 16 bit checksum to every frame"
+msgstr "Ajoute à chaque trame une somme de contrôle sur 16 bits"
+
+#: src/filewriter/mp3.c:981
+#: src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309
+#: src/modplug/gui/modplug.glade:487
+msgid "Quality"
+msgstr "Qualité"
+
+#: src/filewriter/mp3.c:993
+msgid "Enable VBR/ABR"
+msgstr "Activer VBR/ABR"
+
+#: src/filewriter/mp3.c:1005
+msgid "Type:"
+msgstr "Type :"
+
+#: src/filewriter/mp3.c:1016
+msgid "Variable bitrate"
+msgstr "Débit variable"
+
+#: src/filewriter/mp3.c:1028
+msgid "Average bitrate"
+msgstr "Débit moyen"
+
+#: src/filewriter/mp3.c:1042
+msgid "VBR Options:"
+msgstr "Options VBR :"
+
+#: src/filewriter/mp3.c:1058
+msgid "Minimum bitrate (kbps):"
+msgstr "Débit minimal (kbps) :"
+
+#: src/filewriter/mp3.c:1094
+msgid "Maximum bitrate (kbps):"
+msgstr "Débit maximal (kbps) :"
+
+#: src/filewriter/mp3.c:1126
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forcer de manière stricte le débit minimal"
+
+#: src/filewriter/mp3.c:1128
+msgid "For use with players that do not support low bitrate mp3 (Apex AD600-A DVD/mp3 player)"
+msgstr "Cette option est destinée aux lecteurs qui ne supportent pas les fichiers mp3 dont le débit est bas (le lecteur DVD/mp3 'Apex AD600-A', notamment)"
+
+#: src/filewriter/mp3.c:1141
+msgid "ABR Options:"
+msgstr "Options ABR :"
+
+#: src/filewriter/mp3.c:1151
+msgid "Average bitrate (kbps):"
+msgstr "Débit moyen (kbps) :"
+
+#: src/filewriter/mp3.c:1188
+msgid "VBR quality level:"
+msgstr "Niveau de qualité VBR :"
+
+#: src/filewriter/mp3.c:1203
+msgid ""
+"highest:0;\n"
+"lowest:9;\n"
+"default:4;"
+msgstr ""
+"Le plus élevé : 0\n"
+"Le plus bas : 9\n"
+"Défaut : 4"
+
+#: src/filewriter/mp3.c:1211
+msgid "Don't write Xing VBR header"
+msgstr "Ne pas écrire l'en-tête VBR 'Xing'"
+
+#: src/filewriter/mp3.c:1226
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1238
+msgid "Frame params:"
+msgstr "Paramètres des trames :"
+
+#: src/filewriter/mp3.c:1250
+msgid "Mark as copyright"
+msgstr "Marquer comme soumises aux droits d'utilisation"
+
+#: src/filewriter/mp3.c:1261
+msgid "Mark as original"
+msgstr "Marquer comme originales"
+
+#: src/filewriter/mp3.c:1273
+msgid "ID3 params:"
+msgstr "Paramètres ID3 :"
+
+#: src/filewriter/mp3.c:1284
+msgid "Force addition of version 2 tag"
+msgstr "Forcer l'ajout de la version 2 des métadonnées"
+
+#: src/filewriter/mp3.c:1294
+msgid "Only add v1 tag"
+msgstr "Ajouter uniquement la version 1 des métadonnées"
+
+#: src/filewriter/mp3.c:1301
+msgid "Only add v2 tag"
+msgstr "Ajouter uniquement la version 2 des métadonnées"
+
+#: src/filewriter/mp3.c:1322
+msgid "Tags"
+msgstr "Métadonnées"
+
+#: src/filewriter/vorbis.c:267
+msgid "Vorbis Encoder Configuration"
+msgstr "Encodeur 'Vorbis'"
+
+#: src/filewriter/vorbis.c:287
+msgid "Quality level (0 - 10):"
+msgstr "Niveau de qualité (0 - 10) :"
+
+#: src/flacng/plugin.c:718
+msgid "FLAC Audio Plugin "
+msgstr "Module audio 'Flac' "
+
+#: src/flacng/plugin.c:719
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"\n"
+"\n"
+"Code original :\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/flacng/plugin.c:724
+msgid "About FLAC Audio Plugin"
+msgstr "À propos du module audio 'FLAC'"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+msgid "About Gnome Shortcut Plugin"
+msgstr "À propos du module 'Gnome Shortcut'"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+"'Gnome Shortcut'\n"
+"\n"
+"Ce module permet de contrôler le lecteur avec les raccourcis de Gnome.\n"
+"\n"
+"Droits d'utilisation : Sascha Hlusiak <contact@saschahlusiak.de> (2007)\n"
+"\n"
+
+#: src/hotkey/plugin.c:607
+msgid "(none)"
+msgstr "(néant)"
+
+#: src/hotkey/plugin.c:752
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configuration du module 'Global Hotkey'"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr "Appuyez sur une combinaison de touches, à l'intérieur d'un champ textuel."
+
+#: src/hotkey/plugin.c:773
+msgid "<b>Playback:</b>"
+msgstr "<b>Lecture :</b>"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr "<i>Configure les touches qui contrôlent la lecture d'Audacious.</i>"
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr "Piste précédente :"
+
+#: src/hotkey/plugin.c:798
+msgid "Play/Pause:"
+msgstr "Lecture / Pause :"
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr "Pause :"
+
+#: src/hotkey/plugin.c:804
+msgid "Stop:"
+msgstr "Arrêt :"
+
+#: src/hotkey/plugin.c:807
+msgid "Next Track:"
+msgstr "Piste suivante :"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr "Avancer de 5 secondes :"
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr "Reculer de 5 secondes :"
+
+#: src/hotkey/plugin.c:818
+msgid "<b>Volume Control:</b>"
+msgstr "<b>Contrôle du volume :</b>"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr "<i>Configure les touches qui contrôlent le volume de la musique.</i>"
+
+#: src/hotkey/plugin.c:841
+msgid "Mute:"
+msgstr "Muet :"
+
+#: src/hotkey/plugin.c:844
+msgid "Volume Up:"
+msgstr "Augmenter le volume :"
+
+#: src/hotkey/plugin.c:847
+msgid "Volume Down:"
+msgstr "Réduire le volume :"
+
+#: src/hotkey/plugin.c:852
+msgid "<b>Player:</b>"
+msgstr "<b>Lecteur :</b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr "<i>Configure les touches qui contrôlent le lecteur.</i>"
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr "Aller au fichier... :"
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr "Afficher / Cacher les fenêtres du lecteur :"
+
+#: src/hotkey/plugin.c:903
+msgid "About Global Hotkey Plugin"
+msgstr "À propos du module 'Global Hotkey'"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+"Module 'Global Hotkey'\n"
+"\n"
+"Permet de contrôler le lecteur à l'aide de combinaisons de touches\n"
+"ou des fonctions multimedia du clavier.\n"
+"\n"
+"Droits d'utilisation : Sascha Hlusiak <contact@saschahlusiak.de> (2007)\n"
+"\n"
+"\n"
+"Ont contribué :\n"
+"\n"
+"Vladimir Paskov     <vlado.paskov@gmail.com> (Droits d'utilisation 2006-2007)\n"
+"Ville Syrjälä            <syrjala@sci.fi>                     (Droits d'utilisation 2000-2002)\n"
+"Bryn Davies           <curious@ihug.com.au>\n"
+"Jonathan A. Davis  <davis@jdhouse.org>\n"
+"Jeremy Tan             <nsx@nsx.homeip.net>\n"
+"\n"
+
+#: src/jack/configure.c:70
+msgid "Connect to all available jack ports"
+msgstr "Connexion à tous les ports 'jack' disponibles"
+
+#: src/jack/configure.c:77
+msgid "Connect only the output ports"
+msgstr "Connexion aux ports de sortie uniquement"
+
+#: src/jack/configure.c:84
+msgid "Connect to no ports"
+msgstr "Aucune connexion"
+
+#: src/jack/configure.c:99
+msgid "jack Plugin configuration"
+msgstr "Configuration du module 'Jack'"
+
+#: src/jack/configure.c:117
+msgid "Connection mode:"
+msgstr "Mode de connexion :"
+
+#: src/jack/configure.c:129
+msgid "Enable debug printing"
+msgstr "Activer le mode de débogage"
+
+#: src/jack/jack.c:102
+msgid "Sample rate mismatch"
+msgstr "Problème de correspondance entre les taux d'échantillonnage"
+
+#: src/jack/jack.c:105
+msgid ""
+"Xmms is asking for a sample rate that differs from\n"
+" that of the jack server.  Xmms 1.2.8 or later\n"
+"contains resampling routines that xmms-jack will\n"
+"dynamically load and use to perform resampling.\n"
+"Or you can restart the jack server\n"
+"with a sample rate that matches the one that\n"
+"xmms desires.  -r is the option for the jack\n"
+"alsa driver so -r 44100 or -r 48000 should do\n"
+"\n"
+"Chris Morgan <cmorgan@alum.wpi.edu>\n"
+msgstr ""
+"Xmms demande un taux d'échantillonnage différent du\n"
+" taux du serveur 'jack'. Depuis la version 1.2.8,\n"
+"Xmms inclut des routines de rééchantillonnage que\n"
+"'xmms-jack' charge de manière dynamique et utilise\n"
+"pour procéder au rééchantillonnage.\n"
+"Vous pouvez redémarrer le serveur 'jack' avec un taux\n"
+"d'échantillonnage qui correspond à celui que demande\n"
+"Xmms. '-r' est l'option pour le pilote ALSA 'jack'.\n"
+"Donc, '-r 44100' ou 'r 48000' devrait convenir.\n"
+"\n"
+"Chris Morgan <cmorgan@alum.wpi.edu>\n"
+
+#: src/jack/jack.c:118
+#: src/wma/wma.c:157
+msgid " Close "
+msgstr " Fermer "
+
+#: src/jack/jack.c:535
+msgid "About JACK Output Plugin 0.17"
+msgstr "À propos du module 'JACK' 0.17"
+
+#: src/jack/jack.c:536
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr ""
+"Pilote 'jack' pour XMMS 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Rétroportage pour Audacious effectué par :\n"
+"Giacomo Lozito from develia.org"
+
+#: src/ladspa/ladspa.c:722
+msgid "This LADSPA plugin has no user controls"
+msgstr "Cette extension LADSPA ne dispose pas de contrôles utilisateur"
+
+#: src/ladspa/ladspa.c:767
+#: src/ladspa/ladspa.c:853
+msgid "Name"
+msgstr "Nom"
+
+#: src/ladspa/ladspa.c:853
+msgid "UID"
+msgstr "UID"
+
+#: src/ladspa/ladspa.c:928
+msgid "Installed plugins"
+msgstr "Extensions installées"
+
+#: src/ladspa/ladspa.c:937
+msgid "Running plugins"
+msgstr "Extensions utilisées"
+
+#: src/ladspa/ladspa.c:952
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/ladspa/ladspa.c:956
+msgid "Remove"
+msgstr "Enlever"
+
+#: src/ladspa/ladspa.c:969
+msgid "LADSPA Plugin Catalog"
+msgstr "Liste des extensions 'LADSPA'"
+
+#: src/lastfm/lastfm.c:96
+msgid ""
+"<b><big>Couldn't initialize the last.fm radio plugin.</big></b>\n"
+"\n"
+"Check if your Scrobbler's plugin login data is set up properly."
+msgstr ""
+"<b><big>Impossible d'initialiser le module 'Radio last.fm'.</big></b>\n"
+"\n"
+"Veuillez vérifier si les informations de connexion de 'Scrobbler' sont correctes."
+
+#: src/lirc/about.c:63
+msgid "About LIRC Audacious Plugin"
+msgstr "À propos du module 'LIRC'"
+
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Module 'LIRC' "
+
+#: src/lirc/about.c:92
+msgid ""
+"\n"
+"A simple plugin that lets you control\n"
+"Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
+"from the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"You can get LIRC information at:\n"
+"http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
+msgstr ""
+"\n"
+"\n"
+"'LIRC' est un module simple qui permet de contrôler\n"
+"Audacious en utilisant le démon de contrôle distant 'LIRC'.\n"
+"\n"
+"Le module a été modifié pour Audacious par\n"
+"Tony Vroon <chainsaw@gentoo.org>,\n"
+"à partir du module 'LIRC' pour XMMS écrit par :\n"
+"\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"\n"
+"Vous pouvez obtenir des informations sur 'LIRC' à cette adresse :\n"
+"http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: impossible d'initialiser le support 'LIRC'\n"
+
+#: src/lirc/lirc.c:84
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: impossible de lire le fichier de configuration de 'LIRC'\n"
+"%s: veuillez consulter la documentation de 'LIRC'\n"
+"%s: relative à la création d'un fichier de configuration correct\n"
+
+#: src/lirc/lirc.c:295
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: commande inconnue \"%s\"\n"
+
+#: src/lirc/lirc.c:305
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: déconnecté de 'LIRC'\n"
+
+#: src/madplug/configure.c:148
+msgid "MPEG Audio Plugin Configuration"
+msgstr "Configuration du module audio 'MPEG'"
+
+#: src/madplug/configure.c:161
+msgid "Dither output when rounding to 16-bit"
+msgstr "Utiliser la diffusion d'erreur lorsque le flux est arrondi à 16 bits"
+
+#: src/madplug/configure.c:167
+msgid "Enable fast play-length calculation"
+msgstr "Activer le calcul rapide de la durée"
+
+#: src/madplug/configure.c:172
+msgid "Parse XING headers"
+msgstr "Analyser les en-têtes 'XING'"
+
+#: src/madplug/configure.c:177
+msgid "Use SJIS to write ID3 tags instead of UTF-8"
+msgstr "Utiliser SJIS pour écrire les métadonnées ID3, à la place d'UTF-8"
+
+#: src/madplug/configure.c:181
+msgid "Display average bitrate for VBR"
+msgstr "Afficher le débit moyen pour l'encodage VBR"
+
+#: src/madplug/configure.c:186
+msgid "Force reopen audio when audio type changed"
+msgstr "Forcer la réouverture de la sortie audio lorsque le format du flux a changé"
+
+#: src/madplug/configure.c:196
+msgid "Enable ReplayGain processing"
+msgstr "Activer le traitement 'ReplayGain'"
+
+#: src/madplug/configure.c:201
+msgid "Track mode"
+msgstr "Mode 'piste'"
+
+#: src/madplug/configure.c:208
+msgid "6dB hard limiting"
+msgstr "Limite stricte à 6 dB"
+
+#: src/madplug/configure.c:213
+msgid "Default gain (dB):"
+msgstr "Gain par défaut (dB) :"
+
+#: src/madplug/configure.c:224
+msgid "Preamp (dB):"
+msgstr "Préamplification (dB) :"
+
+#: src/madplug/configure.c:233
+#: src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219
+#: src/wavpack/ui.cxx:545
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: src/madplug/configure.c:238
+#: src/vorbis/configure.c:135
+msgid "Override generic titles"
+msgstr "Remplacer les titres génériques"
+
+#: src/madplug/configure.c:251
+msgid "ID3 format:"
+msgstr "Format ID3 :"
+
+#: src/madplug/configure.c:261
+#: src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070
+#: src/vorbis/configure.c:158
+msgid "Title"
+msgstr "Titre"
+
+#: src/madplug/fileinfo.c:158
+#: src/madplug/fileinfo.c:236
+msgid "File Info"
+msgstr "Informations sur le fichier"
+
+#: src/madplug/fileinfo.c:158
+msgid "Couldn't open file!"
+msgstr "Impossible d'ouvrir le fichier !"
+
+#: src/madplug/fileinfo.c:236
+msgid "Couldn't write tag!"
+msgstr "Impossible d'écrire les métadonnées !"
+
+#: src/madplug/fileinfo.c:330
+msgid "<b>Name:</b>"
+msgstr "<b>Nom :</b>"
+
+#: src/madplug/fileinfo.c:344
+msgid " MPEG Info "
+msgstr " Informations MPEG "
+
+#: src/madplug/fileinfo.c:417
+msgid " ID3 Tag "
+msgstr " Métadonnées ID3 "
+
+#: src/madplug/fileinfo.c:425
+#: src/musepack/libmpc.cxx:514
+#: src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582
+#: src/wavpack/ui.cxx:170
+msgid "Title:"
+msgstr "Titre :"
+
+#: src/madplug/fileinfo.c:435
+#: src/musepack/libmpc.cxx:518
+#: src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593
+#: src/wavpack/ui.cxx:182
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: src/madplug/fileinfo.c:445
+#: src/musepack/libmpc.cxx:522
+#: src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604
+#: src/wavpack/ui.cxx:194
+msgid "Album:"
+msgstr "Album :"
+
+#: src/madplug/fileinfo.c:455
+#: src/musepack/libmpc.cxx:526
+#: src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615
+#: src/wavpack/ui.cxx:206
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: src/madplug/fileinfo.c:465
+#: src/musepack/libmpc.cxx:530
+#: src/tta/libtta.c:364
+#: src/wavpack/ui.cxx:219
+msgid "Year:"
+msgstr "Année :"
+
+#: src/madplug/fileinfo.c:476
+#: src/tta/libtta.c:376
+#: src/vorbis/fileinfo.c:638
+#: src/wavpack/ui.cxx:232
+msgid "Track number:"
+msgstr "Piste :"
+
+#: src/madplug/fileinfo.c:487
+#: src/musepack/libmpc.cxx:540
+#: src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650
+#: src/wavpack/ui.cxx:246
+msgid "Genre:"
+msgstr "Genre :"
+
+#: src/madplug/fileinfo.c:500
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: src/madplug/fileinfo.c:620
+#: src/musepack/libmpc.cxx:634
+#: src/tta/libtta.c:411
+#: src/wavpack/ui.cxx:407
+#, c-format
+msgid "File Info - %s"
+msgstr "Informations sur le fichier : %s"
+
+#: src/madplug/fileinfo.c:651
+#, c-format
+msgid "Layer %s"
+msgstr "Couche %s"
+
+#: src/madplug/fileinfo.c:654
+#, c-format
+msgid "VBR (avg. %d kbps)"
+msgstr "VBR (moyenne : %d kbps)"
+
+#: src/madplug/fileinfo.c:660
+#: src/vorbis/fileinfo.c:959
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: src/madplug/fileinfo.c:663
+#, c-format
+msgid "%d frames"
+msgstr "%d trames"
+
+#: src/madplug/fileinfo.c:672
+#, c-format
+msgid "%d:%02d (%d seconds)"
+msgstr "%d:%02d (%d secondes)"
+
+#: src/madplug/fileinfo.c:677
+#, c-format
+msgid "RG_album=%4s (x%4.2f)"
+msgstr "ReplayGain (album) = %4s (x%4.2f)"
+
+#: src/madplug/fileinfo.c:685
+#, c-format
+msgid "RG_track=%4s (x%4.2f)"
+msgstr "ReplayGain (piste) = %4s (x%4.2f)"
+
+#: src/madplug/fileinfo.c:693
+#, c-format
+msgid "Peak album=%4s (%+5.3fdBFS)"
+msgstr "Pic sonore (album) = %4s (%+5.3fdBFS)"
+
+#: src/madplug/fileinfo.c:702
+#, c-format
+msgid "Peak track=%4s (%+5.3fdBFS)"
+msgstr "Pic sonore (piste) = %4s (%+5.3fdBFS)"
+
+#: src/madplug/fileinfo.c:711
+#, c-format
+msgid "mp3gain undo=%4s (%+5.3fdB)"
+msgstr "'mp3gain' (annulation) = %4s (%+5.3fdB)"
+
+#: src/madplug/fileinfo.c:719
+#, c-format
+msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
+msgstr "'mp3gain' (minmax) = %4s (max-min=%+6.3fdB)"
+
+#: src/madplug/plugin.c:578
+#, c-format
+msgid ""
+"Audacious MPEG Audio Plugin\n"
+"\n"
+"Compiled against libMAD version: %d.%d.%d%s\n"
+"\n"
+"Written by:\n"
+"    William Pitcock <nenolod@sacredspiral.co.uk>\n"
+"    Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
+"\n"
+"Portions derived from XMMS-MAD by:\n"
+"    Sam Clegg\n"
+"\n"
+"ReplayGain support by:\n"
+"    Samuel Krempp"
+msgstr ""
+"Module audio 'MPEG' pour Audacious\n"
+"\n"
+"Compilé avec 'libMAD' -version : %d.%d.%d%s-\n"
+"\n"
+"\n"
+"Écrit par :\n"
+"\n"
+"William Pitcock  <nenolod@sacredspiral.co.uk>\n"
+"Yoshiki Yazawa   <yaz@cc.rim.or.jp>\n"
+"\n"
+"\n"
+"Des parties du code proviennent de 'XMMS-MAD' (Sam Clegg)\n"
+"\n"
+"\n"
+"Support de 'ReplayGain' : Samuel Krempp"
+
+#: src/madplug/plugin.c:594
+msgid "About MPEG Audio Plugin"
+msgstr "À propos du module audio 'MPEG'"
+
+#: src/metronom/metronom.c:87
+msgid "About Metronom"
+msgstr "À propos de 'Métronome'"
+
+#: src/metronom/metronom.c:88
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"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 ""
+"'Métronome' est un générateur de pulsations écrit par\n"
+"Martin Strauss <mys@faveve.uni-stuttgart.de>.\n"
+"\n"
+"Pour l'utiliser, ajouter une adresse du type :\n"
+"tact://Battements*Numérateur/Dénominateur\n"
+"\n"
+"Exemples :\n"
+"\n"
+"'tact://77' produira 77 battements par minute\n"
+"'tact://60*3/4' produira 60 battements par minute (mesure à 3/4)"
+
+#: src/metronom/metronom.c:198
+#: src/metronom/metronom.c:262
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Métronome : %d bpm"
+
+#: src/metronom/metronom.c:200
+#: src/metronom/metronom.c:264
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Métronome : %d bpm %d/%d"
+
+#: src/modplug/gui/interface.cxx:133
+#: src/modplug/gui/modplug.glade:9
+msgid "ModPlug Configuration"
+msgstr "Configuration de 'ModPlug'"
+
+#: src/modplug/gui/interface.cxx:170
+#: src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
+msgid "16 bit"
+msgstr "16 bits"
+
+#: src/modplug/gui/interface.cxx:177
+#: src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
+msgid "8 bit"
+msgstr "8 bits"
+
+#: src/modplug/gui/interface.cxx:208
+#: src/modplug/gui/modplug.glade:178
+msgid "Mono (downmix)"
+msgstr "Mono (sous-mélange)"
+
+#: src/modplug/gui/interface.cxx:237
+#: src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr "Méthode du 'plus proche voisin' (la plus rapide)"
+
+#: src/modplug/gui/interface.cxx:244
+#: src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr "Interpolation linéaire (rapide)"
+
+#: src/modplug/gui/interface.cxx:251
+#: src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr "Interpolation par segments ('spline') (bonne qualité)"
+
+#: src/modplug/gui/interface.cxx:258
+#: src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr "Filtre à réponse impulsionnelle finie '8-tap FIR' (qualité optimale)"
+
+#: src/modplug/gui/interface.cxx:282
+#: src/modplug/gui/modplug.glade:384
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/gui/interface.cxx:289
+#: src/modplug/gui/modplug.glade:403
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/gui/interface.cxx:296
+#: src/modplug/gui/modplug.glade:423
+msgid "11 kHz"
+msgstr "11 kHz"
+
+#: src/modplug/gui/interface.cxx:304
+#: src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Taux d'échantillonnage"
+
+#: src/modplug/gui/interface.cxx:338
+#: src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466
+#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540
+#: src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910
+#: src/modplug/gui/modplug.glade:1089
+msgid "Enable"
+msgstr "Activer  "
+
+#: src/modplug/gui/interface.cxx:367
+#: src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607
+#: src/modplug/gui/modplug.glade:977
+msgid "Depth"
+msgstr "Profondeur"
+
+#: src/modplug/gui/interface.cxx:375
+#: src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635
+#: src/modplug/gui/modplug.glade:1005
+msgid "Delay"
+msgstr "Délai"
+
+#: src/modplug/gui/interface.cxx:383
+#: src/modplug/gui/modplug.glade:672
+msgid "Reverb"
+msgstr "Réverbération"
+
+#: src/modplug/gui/interface.cxx:429
+#: src/modplug/gui/modplug.glade:786
+msgid "Amount"
+msgstr "Intensité"
+
+#: src/modplug/gui/interface.cxx:437
+#: src/modplug/gui/modplug.glade:814
+msgid "Range"
+msgstr "Portée"
+
+#: src/modplug/gui/interface.cxx:445
+#: src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr "Amplification des basses"
+
+#: src/modplug/gui/interface.cxx:511
+#: src/modplug/gui/modplug.glade:1042
+msgid "Surround"
+msgstr "Son d'ambiance"
+
+#: src/modplug/gui/interface.cxx:550
+#: src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+"Note : une valeur de préamplification excessive\n"
+"peut produire des coupures et des distorsions\n"
+"(des clics et des bruits secs assez agaçants) !"
+
+#: src/modplug/gui/interface.cxx:556
+#: src/modplug/gui/modplug.glade:1192
+msgid "Preamp"
+msgstr "Préamplification"
+
+#: src/modplug/gui/interface.cxx:561
+#: src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr "Effets"
+
+#: src/modplug/gui/interface.cxx:590
+#: src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr "Utiliser le nom du fichier comme titre du morceau"
+
+#: src/modplug/gui/interface.cxx:595
+#: src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr "Informations rapides sur la liste de lecture"
+
+#: src/modplug/gui/interface.cxx:606
+#: src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr "Réduction du bruit"
+
+#: src/modplug/gui/interface.cxx:612
+#: src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr "Lire les modules musicaux Amiga"
+
+#: src/modplug/gui/interface.cxx:635
+#: src/modplug/gui/modplug.glade:1430
+msgid "Don't loop"
+msgstr "Ne pas répéter"
+
+#: src/modplug/gui/interface.cxx:647
+#: src/modplug/gui/modplug.glade:1455
+msgid "Loop"
+msgstr "Répéter"
+
+#: src/modplug/gui/interface.cxx:660
+#: src/modplug/gui/modplug.glade:1493
+msgid "time(s)"
+msgstr "fois"
+
+#: src/modplug/gui/interface.cxx:666
+#: src/modplug/gui/modplug.glade:1526
+msgid "Loop forever"
+msgstr "Répéter en boucle"
+
+#: src/modplug/gui/interface.cxx:673
+#: src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr "Répétition"
+
+#: src/modplug/gui/interface.cxx:847
+#: src/modplug/gui/modplug.glade:1668
+msgid "MOD Info"
+msgstr "Informations sur le module"
+
+#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/modplug.glade:1710
+msgid ""
+"Filename:\n"
+"Title:\n"
+"Type:\n"
+"Length:\n"
+"Speed:\n"
+"Tempo:\n"
+"Samples:\n"
+"Instruments:\n"
+"Patterns:\n"
+"Channels:"
+msgstr ""
+"Nom du fichier :\n"
+"Titre :\n"
+"Type :\n"
+"Durée :\n"
+"Vitesse :\n"
+"Tempo :\n"
+"Échantillons :\n"
+"Instruments :\n"
+"Séquences :\n"
+"Voies :"
+
+#: src/modplug/gui/interface.cxx:871
+#: src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+
+#: src/modplug/gui/interface.cxx:901
+#: src/modplug/gui/modplug.glade:1849
+msgid "Samples"
+msgstr "Échantillons"
+
+#: src/modplug/gui/interface.cxx:926
+#: src/modplug/gui/modplug.glade:1914
+msgid "Instruments"
+msgstr "Instruments"
+
+#: src/modplug/gui/interface.cxx:947
+#: src/modplug/gui/modplug.glade:1971
+msgid "Message"
+msgstr "Commentaires"
+
+#: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr "Module d'entrée 'Modplug' pour Audacious, version "
+
+#: src/modplug/gui/main.cxx:45
+msgid ""
+"\n"
+"Modplug sound engine written by Olivier Lapicque.\n"
+"XMMS interface for Modplug by Kenton Varda.\n"
+"(c)2000 Olivier Lapicque and Kenton Varda.\n"
+"Updates and Maintainance by Konstanty Bialkowski.\n"
+"Ported to BMP by Theofilos Intzoglou."
+msgstr ""
+"\n"
+"\n"
+"Le moteur sonore de 'Modplug' a été écrit par Olivier Lapicque.\n"
+"L'interface XMMS pour 'Modplug' a été conçue par Kenton Varda.\n"
+"\n"
+"Droits d'utilisation (2000) : Olivier Lapicque et Kenton Varda.\n"
+"\n"
+"Mises à jour et maintenance : Konstanty Bialkowski.\n"
+"Rétroportage pour BMP : Theofilos Intzoglou."
+
+#: src/modplug/gui/main.cxx:46
+msgid "About Modplug"
+msgstr "À propos de 'Modplug'"
+
+#: src/modplug/gui/support.cxx:88
+#: src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90
+#: src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Impossible d'ouvrir l'image : %s"
+
+#: src/musepack/libmpc.cxx:146
+msgid "Musepack Decoder Plugin 1.2"
+msgstr "Décodeur 'Musepack' 1.2"
+
+#: src/musepack/libmpc.cxx:147
+msgid ""
+"Plugin code by\n"
+"Benoit Amiaux\n"
+"Martin Spuler\n"
+"Kuniklo\n"
+"\n"
+"Get latest version at http://musepack.net\n"
+msgstr ""
+"Code du module écrit par :\n"
+"\n"
+"Benoit Amiaux\n"
+"Martin Spuler\n"
+"Kuniklo\n"
+"\n"
+"Vous pouvez obtenir la dernière version à l'adresse suivante :\n"
+"http://musepack.net\n"
+
+#: src/musepack/libmpc.cxx:148
+msgid "Nevermind"
+msgstr "Qu'importe !"
+
+#: src/musepack/libmpc.cxx:166
+msgid "Musepack Decoder Configuration"
+msgstr "Configuration de 'Musepack'"
+
+#: src/musepack/libmpc.cxx:176
+msgid "General Settings"
+msgstr "Réglages généraux"
+
+#: src/musepack/libmpc.cxx:183
+#: src/wavpack/ui.cxx:490
+msgid "Enable Dynamic Bitrate Display"
+msgstr "Activer l'affichage dynamique du débit"
+
+#: src/musepack/libmpc.cxx:187
+#: src/wavpack/ui.cxx:496
+msgid "Plugin"
+msgstr "Module"
+
+#: src/musepack/libmpc.cxx:190
+msgid "ReplayGain Settings"
+msgstr "Paramètres de 'ReplayGain'"
+
+#: src/musepack/libmpc.cxx:197
+#: src/vorbis/configure.c:170
+#: src/wavpack/ui.cxx:508
+msgid "Enable Clipping Prevention"
+msgstr "Activer la prévention de la saturation"
+
+#: src/musepack/libmpc.cxx:202
+#: src/vorbis/configure.c:175
+#: src/wavpack/ui.cxx:513
+msgid "Enable ReplayGain"
+msgstr "Activer 'ReplayGain'"
+
+#: src/musepack/libmpc.cxx:207
+msgid "ReplayGain Type"
+msgstr "Traitement 'ReplayGain'"
+
+#: src/musepack/libmpc.cxx:215
+msgid "Use Track Gain"
+msgstr "Utiliser le gain 'piste'"
+
+#: src/musepack/libmpc.cxx:219
+msgid "Use Album Gain"
+msgstr "Utiliser le gain 'album'"
+
+#: src/musepack/libmpc.cxx:491
+#: src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564
+#: src/tta/libtta.c:302
+#: src/wavpack/ui.cxx:150
+msgid "Filename:"
+msgstr "Nom du fichier :"
+
+#: src/musepack/libmpc.cxx:506
+msgid "Musepack Tag"
+msgstr "Métadonnées 'Musepack'"
+
+#: src/musepack/libmpc.cxx:535
+msgid "Track:"
+msgstr "Piste :"
+
+#: src/musepack/libmpc.cxx:551
+#: src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820
+#: src/wavpack/ui.cxx:265
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/musepack/libmpc.cxx:554
+#: src/wavpack/ui.cxx:271
+msgid "Remove Tag"
+msgstr "Supprimer les métadonnées"
+
+#: src/musepack/libmpc.cxx:562
+msgid "Musepack Info"
+msgstr "Informations 'Musepack'"
+
+#: src/musepack/libmpc.cxx:595
+#, c-format
+msgid "Streamversion %d"
+msgstr "Version du flux : %d"
+
+#: src/musepack/libmpc.cxx:596
+#, c-format
+msgid "Encoder: %s"
+msgstr "Encodeur : %s"
+
+#: src/musepack/libmpc.cxx:597
+#, c-format
+msgid "Profile: %s"
+msgstr "Profil : %s"
+
+#: src/musepack/libmpc.cxx:598
+#, c-format
+msgid "Average bitrate: %6.1f kbps"
+msgstr "Débit moyen : %6.1f kbps"
+
+#: src/musepack/libmpc.cxx:599
+#, c-format
+msgid "Samplerate: %d Hz"
+msgstr "Taux d'échantillonnage : %d Hz"
+
+#: src/musepack/libmpc.cxx:600
+#, c-format
+msgid "Channels: %d"
+msgstr "Voies : %d"
+
+#: src/musepack/libmpc.cxx:601
+#, c-format
+msgid "Length: %d:\\%.2d"
+msgstr "Durée : %d:\\%.2d"
+
+#: src/musepack/libmpc.cxx:602
+#, c-format
+msgid "File size: %d Bytes"
+msgstr "Taille du fichier : %d Bytes"
+
+#: src/musepack/libmpc.cxx:603
+#, c-format
+msgid "Track Peak: %5u"
+msgstr "Pic sonore 'piste' : %5u"
+
+#: src/musepack/libmpc.cxx:604
+#, c-format
+msgid "Track Gain: %-+2.2f dB"
+msgstr "Gain 'piste' : %-+2.2f dB"
+
+#: src/musepack/libmpc.cxx:605
+#, c-format
+msgid "Album Peak: %5u"
+msgstr "Pic sonore 'album' : %5u"
+
+#: src/musepack/libmpc.cxx:606
+#, c-format
+msgid "Album Gain: %-+5.2f dB"
+msgstr "Gain 'album': %-+5.2f dB"
+
+#: src/null/null.c:61
+msgid "Null output plugin "
+msgstr "Module de sortie 'Null' "
+
+#: src/null/null.c:62
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr ""
+" \n"
+"\n"
+"Écrit par Christian Birchinger <joker@netswarm.net>,\n"
+"à partir du module pour XMMS de Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:65
+msgid "About Null Output"
+msgstr "À propos du module de sortie 'Null'"
+
+#: src/null/null.c:94
+msgid "Null output preferences"
+msgstr "Préférences du module de sortie 'Null'"
+
+#: src/null/null.c:103
+msgid "Run in real time"
+msgstr "Utiliser en temps réel"
+
+#: src/OSS4/about.c:42
+msgid "About OSSv4 Driver"
+msgstr "À propos du pilote 'OSSv4'"
+
+#: src/OSS4/about.c:43
+msgid ""
+"Audacious OSSv4 Driver\n"
+"\n"
+"Based on the OSSv3 Output plugin,\n"
+"Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\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."
+msgstr ""
+"Pilote 'OSSv4' pour Audacious\n"
+"\n"
+"Basé sur le module de sortie 'OSSv3'\n"
+"Rétroporté pour 'VMIX' du pilote 'OSSv4' par\n"
+"Cristi Magherusan <majeru@gentoo.ro>\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/OSS4/configure.c:120
+#: src/OSS/configure.c:151
+#, c-format
+msgid "Default (%s)"
+msgstr "Défaut (%s)"
+
+#: src/OSS4/configure.c:170
+#: src/OSS/configure.c:201
+msgid "OSS Driver configuration"
+msgstr "Configuration du pilote 'OSS'"
+
+#: src/OSS4/configure.c:208
+#: src/OSS/configure.c:239
+#: src/OSS/configure.c:280
+msgid "Use alternate device:"
+msgstr "Utiliser un autre périphérique :"
+
+#: src/OSS4/configure.c:230
+#: src/OSS/configure.c:302
+#: src/sun/configure.c:248
+msgid "Devices"
+msgstr "Périphériques"
+
+#: src/OSS4/configure.c:272
+#: src/OSS/configure.c:343
+msgid "Mixer Settings:"
+msgstr "Paramètres du mélangeur :"
+
+#: src/OSS4/configure.c:278
+msgid "Save VMIX volume between sessions"
+msgstr "Conserver le volume de 'VMIX', d'une session à l'autre"
+
+#: src/OSS4/configure.c:284
+#: src/OSS/configure.c:355
+#: src/sun/configure.c:394
+msgid "Mixer"
+msgstr "Mélangeur audio"
+
+#: src/OSS/about.c:39
+msgid "About OSS Driver"
+msgstr "À propos du pilote 'OSS'"
+
+#: src/OSS/about.c:40
+msgid ""
+"Audacious OSS Driver\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."
+msgstr ""
+"Pilote 'OSS' pour Audacious\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/OSS/configure.c:349
+msgid "Volume controls Master not PCM"
+msgstr "Contrôle du volume via le canal 'maître' au lieu du canal 'PCM'"
+
+#: src/pulse_audio/pulse_audio.c:676
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "À propos du module de sortie 'PulseAudio' pour Audacious"
+
+#: src/pulse_audio/pulse_audio.c:677
+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"
+"\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."
+msgstr ""
+"Module de sortie 'PulseAudio' pour Audacious\n"
+"\n"
+" Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/scrobbler/configure.c:99
+msgid "<b>Services</b>"
+msgstr "<b>Services</b>"
+
+#: src/scrobbler/configure.c:121
+#: src/scrobbler/configure.c:161
+msgid "Username:"
+msgstr "Utilisateur :"
+
+#: src/scrobbler/configure.c:127
+#: src/scrobbler/configure.c:167
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: src/scrobbler/configure.c:145
+msgid "<b>Last.FM</b>"
+msgstr "<b>Last.FM</b>"
+
+#: src/scrobbler/configure.c:185
+msgid "<b>Gerpok</b>"
+msgstr "<b>Gerpok</b>"
+
+#: src/scrobbler/gtkstuff.c:21
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr ""
+"Module 'Scrobbler' pour Audacious\n"
+"\n"
+"\n"
+"Auteurs du code original :\n"
+"\n"
+"Audun Hove  <audun@nlc.no>\n"
+"Pipian            <pipian@pipian.com>\n"
+
+#: src/scrobbler/gtkstuff.c:23
+msgid "About Scrobbler Plugin"
+msgstr "À propos du module 'Scrobbler'"
+
+#: src/scrobbler/gtkstuff.c:36
+#, c-format
+msgid ""
+"There has been an error that may require your attention.\n"
+"\n"
+"Contents of server error:\n"
+"\n"
+"%s\n"
+msgstr ""
+"L'erreur qui s'est produite à l'instant peut nécessiter votre attention.\n"
+"\n"
+"Nature de l'erreur du serveur : \n"
+"\n"
+"%s\n"
+
+#: src/scrobbler/gtkstuff.c:42
+msgid "Scrobbler Error"
+msgstr "Erreur de 'Scrobbler'"
+
+#: src/sid/xmms-sid.c:203
+msgid "Error initializing song-length database!\n"
+msgstr "Erreur lors de l'initialisation de la base de données relative à la durée des modules audio !\n"
+
+#: src/sid/xmms-sid.c:209
+msgid "Error initializing STIL database!\n"
+msgstr "Erreur lors de l'initialisation de la base de données 'STIL' !\n"
+
+#: src/sid/xmms-sid.c:347
+msgid "Couldn't allocate memory for audio data buffer!\n"
+msgstr "Impossible d'allouer la mémoire pour les données du tampon audio !\n"
+
+#: src/sid/xmms-sid.c:355
+msgid "Couldn't allocate memory for audio oversampling buffer!\n"
+msgstr "Impossible d'allouer la mémoire pour le tampon du suréchantillonage audio !\n"
+
+#: src/sid/xmms-sid.c:371
+#, c-format
+msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
+msgstr "Impossible d'initialiser le module SID '%s' (sous-module #%i) !\n"
+
+#: src/sid/xmms-sid.c:382
+#, c-format
+msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
+msgstr "Erreur lors de l'ouverture de la sortie audio de XMMS (fmt=%x, freq=%i, nchan=%i) !\n"
+
+#: src/sid/xmms-sid.c:432
+msgid "Oversampling rate-conversion pass failed.\n"
+msgstr "L'opération de conversion par suréchantillonnage a échoué.\n"
+
+#: src/sid/xmms-sid.glade:8
+#: src/sid/xs_interface.c:221
+msgid "Audacious-SID configuration"
+msgstr "Configuration de 'Audacious-SID'"
+
+#: src/sid/xmms-sid.glade:71
+#: src/sid/xs_interface.c:257
+msgid "8-bit"
+msgstr "8 bits"
+
+#: src/sid/xmms-sid.glade:90
+#: src/sid/xs_interface.c:264
+msgid "16-bit"
+msgstr "16 bits"
+
+#: src/sid/xmms-sid.glade:111
+#: src/sid/xs_interface.c:271
+msgid "Resolution:"
+msgstr "Résolution :"
+
+#: src/sid/xmms-sid.glade:196
+#: src/sid/xs_interface.c:302
+msgid "Autopanning"
+msgstr "Son panoramique"
+
+#: src/sid/xmms-sid.glade:217
+#: src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864
+#: src/vorbis/fileinfo.c:921
+msgid "Channels:"
+msgstr "Sortie :"
+
+#: src/sid/xmms-sid.glade:384
+#: src/sid/xs_interface.c:353
+msgid "Samplerate:"
+msgstr "Taux d'échantillonnage :"
+
+#: src/sid/xmms-sid.glade:430
+#: src/sid/xs_interface.c:370
+msgid "Use oversampling"
+msgstr "Utiliser le suréchantillonnage"
+
+#: src/sid/xmms-sid.glade:456
+#: src/sid/xs_interface.c:381
+msgid "Factor:"
+msgstr "Facteur :"
+
+#: src/sid/xmms-sid.glade:500
+#: src/sid/xs_interface.c:393
+msgid "Large factors require more CPU-power"
+msgstr "Les facteurs élevés nécessitent plus de ressources du processeur"
+
+#: src/sid/xmms-sid.glade:534
+#: src/sid/xs_interface.c:399
+msgid "Oversampling:"
+msgstr "Suréchantillonnage :"
+
+#: src/sid/xmms-sid.glade:570
+#: src/sid/xs_interface.c:404
+msgid "Audio"
+msgstr "Audio"
+
+#: src/sid/xmms-sid.glade:620
+#: src/sid/xs_interface.c:436
+msgid "If enabled, this option \"forces\" the emulation engine to use the selected clock speed/frequency. Otherwise the speed is determined from played file itself."
+msgstr "Activée, cette option \"force\" le moteur de l'émulation à utiliser la vitesse/fréquence de l'horloge sélectionnée. Dans le cas contraire, la vitesse est déterminée par le fichier lui-même."
+
+#: src/sid/xmms-sid.glade:622
+#: src/sid/xs_interface.c:432
+msgid "Force speed"
+msgstr "Forcer la vitesse"
+
+#: src/sid/xmms-sid.glade:640
+#: src/sid/xs_interface.c:442
+msgid "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers."
+msgstr "'PAL' est le standard télévisuel européen ; il utilise une fréquence de rafraîchissement vertical de 50 hz. La plupart des compositions 'SID' ont été réalisées pour les ordinateurs 'PAL'."
+
+#: src/sid/xmms-sid.glade:642
+#: src/sid/xs_interface.c:438
+msgid "PAL (50 Hz)"
+msgstr "PAL (50 Hz)"
+
+#: src/sid/xmms-sid.glade:660
+#: src/sid/xs_interface.c:450
+msgid "NTSC is the TV standard with 60Hz vertical refresh rate (and other features that differ from PAL). It is mainly used in United States, Japan and certain other countries."
+msgstr "'NTSC' est le standard télévisuel qui utilise un taux de rafraîchissement vertical de 60 Hz (et d'autres caractéristiques qui diffèrent du standard 'PAL'). Il est principalement utilisé aux États-Unis, au Japon et dans d'autres pays."
+
+#: src/sid/xmms-sid.glade:662
+#: src/sid/xs_interface.c:446
+msgid "NTSC (60 Hz)"
+msgstr "NTSC (60 Hz)"
+
+#: src/sid/xmms-sid.glade:683
+#: src/sid/xs_interface.c:454
+msgid "Clock speed:"
+msgstr "Vitesse d'horloge :"
+
+#: src/sid/xmms-sid.glade:728
+#: src/sid/xs_interface.c:475
+msgid "If enabled, this option \"forces\" the emulation engine to use the selected SID-chip model. Otherwise the preferred SID model is determined from the file (if PSIDv2NG type) or if not available, this setting is used."
+msgstr "Activée, cette option \"force\" le moteur de l'émulation à utiliser le modèle de puce 'SID' sélectionné. Dans le cas contraire, le modèle 'SID' adéquat est déterminé à partir du fichier (s'il est du type 'PSIDv2NG'). Si l'information concernant le modèle n'est pas disponible, c'est le réglage choisi via cette option qui sera utilisé."
+
+#: src/sid/xmms-sid.glade:730
+#: src/sid/xs_interface.c:471
+msgid "Force model"
+msgstr "Forcer le modèle"
+
+#: src/sid/xmms-sid.glade:748
+#: src/sid/xs_interface.c:481
+msgid "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 in few ways, having much fuller filter (which, due to design error, is never same between two different SID-chips) and has the \"volume adjustment bug\", which enables playing of digital samples."
+msgstr "'MOS/CSG 6581 est la toute première version majeure de la puce 'SID'. Elle diffère du modèle '8580' de plusieurs manières : elle dispose d'un filtre plus complet (qui, à cause d'une erreur de conception, n'est jamais le même, d'un modèle de puce 'SID' à l'autre) et présente le \"problème d'ajustement du volume\" qui permet la lecture des échantillons digitaux."
+
+#: src/sid/xmms-sid.glade:750
+#: src/sid/xs_interface.c:477
+msgid "MOS 6581"
+msgstr "MOS 6581"
+
+#: src/sid/xmms-sid.glade:769
+#: src/sid/xs_interface.c:485
+msgid "MOS 8580"
+msgstr "MOS 8580"
+
+#: src/sid/xmms-sid.glade:790
+#: src/sid/xs_interface.c:492
+msgid "SID model:"
+msgstr "Modèle 'SID' :"
+
+#: src/sid/xmms-sid.glade:842
+#: src/sid/xs_interface.c:513
+msgid "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though."
+msgstr "Utilise la bibliothèque 'libSIDPlay 1.x'. L'émulation est plus rapide, mais moins précise (toutefois, elle offre une bonne restitution, dans la plupart des cas)."
+
+#: src/sid/xmms-sid.glade:844
+#: src/sid/xs_interface.c:509
+msgid "SIDPlay 1 (frame-based)"
+msgstr "SIDPlay 1 (synchronisation de la trame)"
+
+#: src/sid/xmms-sid.glade:863
+#: src/sid/xs_interface.c:521
+msgid "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation."
+msgstr "Utilise la bibliothèque 'libSIDPlay 2.x'. L'émulation nécessite un processeur puissant, mais est plus précise."
+
+#: src/sid/xmms-sid.glade:865
+#: src/sid/xs_interface.c:517
+msgid "SIDPlay 2 (cycle-based)"
+msgstr "SIDPlay 2 (synchronisation du cycle)"
+
+#: src/sid/xmms-sid.glade:887
+#: src/sid/xs_interface.c:525
+msgid "Emulation library selection:"
+msgstr "Choix de la bibliothèque d'émulation :"
+
+#: src/sid/xmms-sid.glade:933
+#: src/sid/xs_interface.c:542
+msgid "Real C64 (SIDPlay 2 only)"
+msgstr "C64 réel (SIDPlay 2 uniquement)"
+
+#: src/sid/xmms-sid.glade:952
+#: src/sid/xs_interface.c:549
+msgid "Bank switching"
+msgstr "Pagination"
+
+#: src/sid/xmms-sid.glade:972
+#: src/sid/xs_interface.c:556
+msgid "Transparent ROM"
+msgstr "ROM transparente"
+
+#: src/sid/xmms-sid.glade:992
+#: src/sid/xs_interface.c:563
+msgid "PlaySID environment"
+msgstr "Environnement 'PlaySID'"
+
+#: src/sid/xmms-sid.glade:1013
+#: src/sid/xs_interface.c:570
+msgid "Memory mode:"
+msgstr "Gestion de la mémoire :"
+
+#: src/sid/xmms-sid.glade:1049
+#: src/sid/xs_interface.c:575
+msgid "Emu#1"
+msgstr "Émulation #1"
+
+#: src/sid/xmms-sid.glade:1093
+#: src/sid/xs_interface.c:602
+msgid "This setting can be used to enable libSIDPlay2's \"optimization mode\", which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy."
+msgstr "Ce réglage peut être utilisé pour activer le \"mode d'optimisation\" de la bibliothèque 'libSIDPlay2'. Ce mode réduit l'émulation de 'synchronisation du cycle' à quelque chose équivalant à 'synchronisation de la trame'."
+
+#: src/sid/xmms-sid.glade:1095
+#: src/sid/xs_interface.c:598
+msgid "Optimization mode (faster, inaccurate)"
+msgstr "Mode 'optimisation' (plus rapide, mais imprécis)"
+
+#: src/sid/xmms-sid.glade:1113
+#: src/sid/xs_interface.c:608
+msgid "reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation."
+msgstr "'reSID' est le simulateur logiciel de puces 'SID' créé par Dag Lem par ingénierie inverse. Il constitue probablement l'émulation logicielle la plus proche des véritables puces 'SID'."
+
+#: src/sid/xmms-sid.glade:1115
+#: src/sid/xs_interface.c:604
+msgid "reSID-emulation"
+msgstr "Émulation 'reSID'"
+
+#: src/sid/xmms-sid.glade:1133
+#: src/sid/xs_interface.c:616
+msgid "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve \"near 100%\" similarity to real C64. For more information, see http://www.hardsid.com/"
+msgstr "'HardSID' est une carte EISA/PCI destinée aux systèmes compatibles PC, dans laquelle peut être insérée une véritable puce 'SID'. La carte 'HardSID' peut être contrôlée par un logiciel, mais, combinée à l'émulation d'un système C64 fournie par la bibliothèque 'libSIDPlay2', elle permet d'obtenir un rendu sonore \"presque\" similaire à celui d'un véritable C64. Pour de plus amples informations, vous pouvez consulter le site suivant : http://www.hardsid.com/"
+
+#: src/sid/xmms-sid.glade:1135
+#: src/sid/xs_interface.c:612
+msgid "HardSID"
+msgstr "HardSID"
+
+#: src/sid/xmms-sid.glade:1156
+#: src/sid/xs_interface.c:620
+msgid "SIDPlay 2 options:"
+msgstr "Options de 'SIDPlay 2' :"
+
+#: src/sid/xmms-sid.glade:1201
+#: src/sid/xs_interface.c:641
+msgid "Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample."
+msgstr "La plus rapide, mais aussi la pire méthode de restitution sonore : les échantillons sont choisis selon la méthode du 'plus proche voisin'."
+
+#: src/sid/xmms-sid.glade:1203
+#: src/sid/xs_interface.c:637
+msgid "Fast (nearest neighbour)"
+msgstr "Rapide (méthode du 'plus proche voisin')"
+
+#: src/sid/xmms-sid.glade:1221
+#: src/sid/xs_interface.c:649
+msgid "Uses linear interpolation between samples, yielding higher audio quality with less sampling noise."
+msgstr "Utilise l'interpolation linéaire entre les échantillons. Le flux audio est alors de plus grande qualité et est moins affecté par le bruit. "
+
+#: src/sid/xmms-sid.glade:1223
+#: src/sid/xs_interface.c:645
+msgid "Linear interpolation"
+msgstr "Interpolation linéaire"
+
+#: src/sid/xmms-sid.glade:1263
+#: src/sid/xs_interface.c:660
+msgid "Resampling (FIR)"
+msgstr "Filtre à réponse impulsionnelle finie (FIR)"
+
+#: src/sid/xmms-sid.glade:1284
+#: src/sid/xs_interface.c:667
+msgid "reSID sampling options:"
+msgstr "Options d'échantillonnage de 'reSID' :"
+
+#: src/sid/xmms-sid.glade:1320
+#: src/sid/xs_interface.c:672
+msgid "Emu#2"
+msgstr "Émulation #2"
+
+#: src/sid/xmms-sid.glade:1350
+#: src/sid/xs_interface.c:688
+msgid "This option enables emulation of SID filter. The filter is an essential part of SID's sound capacity, but accurate emulation of it may require quite much CPU power. However, if filter emulation is disabled, tunes won't sound authentic at all if they utilize the filter."
+msgstr "Cette option active l'émulation des filtres 'SID'. Le filtre constitue l'élément' essentiel de la qualité du son 'SID', mais une émulation précise peut utiliser beaucoup de ressources du processeur. Cependant, si l'émulation est désactivée, alors qu'un module audio a été composé avec les fonctions d'un filtre, le son ne sera pas restitué de manière authentique."
+
+#: src/sid/xmms-sid.glade:1352
+#: src/sid/xs_interface.c:684
+msgid "Emulate filters"
+msgstr "Émuler les filtres"
+
+#: src/sid/xmms-sid.glade:1409
+#: src/sid/xs_interface.c:713
+msgid "FS"
+msgstr "FS"
+
+#: src/sid/xmms-sid.glade:1460
+#: src/sid/xs_interface.c:730
+msgid "FM"
+msgstr "FM"
+
+#: src/sid/xmms-sid.glade:1511
+#: src/sid/xs_interface.c:747
+msgid "FT"
+msgstr "FT"
+
+#: src/sid/xmms-sid.glade:1549
+#: src/sid/xs_interface.c:758
+msgid "Reset values"
+msgstr "Réinitialiser"
+
+#: src/sid/xmms-sid.glade:1578
+#: src/sid/xs_interface.c:763
+msgid "SIDPlay1"
+msgstr "SIDPlay 1"
+
+#: src/sid/xmms-sid.glade:1690
+#: src/sid/xs_interface.c:804
+msgid "Export"
+msgstr "Exporter"
+
+#: src/sid/xmms-sid.glade:1711
+#: src/sid/xs_interface.c:812
+msgid "Use"
+msgstr "Utiliser"
+
+#: src/sid/xmms-sid.glade:1753
+#: src/sid/xs_interface.c:828
+msgid "Import"
+msgstr "Importer"
+
+#: src/sid/xmms-sid.glade:1774
+#: src/sid/xs_interface.c:836
+msgid "Delete"
+msgstr "Supprimer"
+
+#: src/sid/xmms-sid.glade:1819
+#: src/sid/xs_interface.c:850
+msgid "Filter curve:"
+msgstr "Courbe du filtre :"
+
+#: src/sid/xmms-sid.glade:1855
+#: src/sid/xs_interface.c:855
+msgid "SIDPlay2"
+msgstr "SIDPlay 2"
+
+#: src/sid/xmms-sid.glade:1891
+#: src/sid/xs_interface.c:861
+msgid "Filters"
+msgstr "Filtres"
+
+#: src/sid/xmms-sid.glade:1935
+#: src/sid/xs_interface.c:888
+msgid "If enabled, the tune is played at least for the specified time, adding silence to the end if necessary."
+msgstr "Si cette option est activée, le module audio sera lu au moins pendant la durée indiquée. Si cela s'avère nécessaire, un silence sera ajouté à la fin du morceau."
+
+#: src/sid/xmms-sid.glade:1937
+#: src/sid/xs_interface.c:884
+msgid "Play at least for specified time"
+msgstr "Lire au moins pendant la durée indiquée"
+
+#: src/sid/xmms-sid.glade:1962
+#: src/sid/xmms-sid.glade:2133
+#: src/sid/xmms-sid.glade:2632
+#: src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949
+#: src/sid/xs_interface.c:1109
+msgid "Playtime:"
+msgstr "Durée :"
+
+#: src/sid/xmms-sid.glade:2041
+#: src/sid/xs_interface.c:915
+msgid "Minimum playtime:"
+msgstr "Durée de lecture minimale :"
+
+#: src/sid/xmms-sid.glade:2086
+#: src/sid/xs_interface.c:936
+msgid "If enabled, tune is played until specified duration is reached (aka maximum playtime)."
+msgstr "Si cette option est activée, le module audio sera lu jusqu'à ce que soit atteinte la durée indiquée (la durée de lecture maximale, en d'autres termes)."
+
+#: src/sid/xmms-sid.glade:2088
+#: src/sid/xs_interface.c:932
+msgid "Play for specified time maximum"
+msgstr "Lire au maximum pendant la durée indiquée"
+
+#: src/sid/xmms-sid.glade:2107
+#: src/sid/xs_interface.c:942
+msgid "If enabled, the maximum playtime is applied only if song/tune length is not known."
+msgstr "Si cette option est activée, la durée de lecture maximale ne sera appliquée que si la durée du module audio ne peut pas être déterminée."
+
+#: src/sid/xmms-sid.glade:2109
+#: src/sid/xs_interface.c:938
+msgid "Only when song length is unknown"
+msgstr "Uniquement si la durée du module audio est inconnue"
+
+#: src/sid/xmms-sid.glade:2212
+#: src/sid/xs_interface.c:969
+msgid "Maximum playtime:"
+msgstr "Durée de lecture maximale :"
+
+#: src/sid/xmms-sid.glade:2257
+#: src/sid/xs_interface.c:990
+msgid "This option enables using of XSIDPLAY compatible song length database. (Refer to Audacious-SID documentation for more information)"
+msgstr "Cette option active l'utilisation d'une base de données compatible 'XSIDPLAY' relative à la durée des modules audio. Pour de plus amples informations, vous pouvez consulter la documentation de 'Audacious-SID'."
+
+#: src/sid/xmms-sid.glade:2259
+#: src/sid/xs_interface.c:986
+msgid "Use XSIDPLAY-compatible database"
+msgstr "Utiliser une base de données compatible 'XSIDPLAY'"
+
+#: src/sid/xmms-sid.glade:2284
+#: src/sid/xs_interface.c:997
+msgid "DB-file:"
+msgstr "Fichier :"
+
+#: src/sid/xmms-sid.glade:2309
+#: src/sid/xs_interface.c:1007
+msgid "Database path and filename"
+msgstr "Emplacement et nom du fichier de la base de données"
+
+#: src/sid/xmms-sid.glade:2329
+#: src/sid/xs_interface.c:1014
+msgid "Browse for song length-database file"
+msgstr "Permet de parcourir l'arborescence pour sélectionner le fichier de la base de données"
+
+#: src/sid/xmms-sid.glade:2356
+#: src/sid/xs_interface.c:1016
+msgid "Song length database:"
+msgstr "Base de données relative à la durée des modules audio :"
+
+#: src/sid/xmms-sid.glade:2392
+#: src/sid/xs_interface.c:1021
+msgid "Songlength"
+msgstr "Durée"
+
+#: src/sid/xmms-sid.glade:2430
+#: src/sid/xs_interface.c:1043
+msgid "By enabling this option you can specify a custom Tuplez formatting string for SID-files. The SID-plugin specific Tuplez tags are described shortly below."
+msgstr "Si vous cochez cette option, vous pourrez indiquer un format de titre personnalisé pour les fichiers 'SID'. Les métadonnées propres au module d'extension 'SID' sont brièvement expliquées ci-dessous."
+
+#: src/sid/xmms-sid.glade:2432
+#: src/sid/xs_interface.c:1039
+msgid "Override generic Tuplez format string"
+msgstr "Remplacer les titres génériques"
+
+#: src/sid/xmms-sid.glade:2457
+#: src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr "Format du titre des modules audio 'SID'"
+
+#: src/sid/xmms-sid.glade:2477
+#: src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr "La description des métadonnées <i>propres à 'SID'</i> est prévue à cet endroit. <b>:D</b>"
+
+#: src/sid/xmms-sid.glade:2511
+#: src/sid/xs_interface.c:1065
+msgid "Song title format:"
+msgstr "Format du titre :"
+
+#: src/sid/xmms-sid.glade:2584
+#: src/sid/xs_interface.c:1096
+msgid "If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added."
+msgstr "Si cette option est activée, les sous-modules de chaque fichier seront ajoutés à la liste de lecture. Dans le cas contraire, seul le sous-module par défaut sera ajouté."
+
+#: src/sid/xmms-sid.glade:2586
+#: src/sid/xs_interface.c:1092
+msgid "Add sub-tunes to playlist"
+msgstr "Ajouter les sous-modules à la liste de lecture"
+
+#: src/sid/xmms-sid.glade:2605
+#: src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr "Ajoute uniquement les sous-modules dont la durée est au moins égale au temps spécifié."
+
+#: src/sid/xmms-sid.glade:2607
+#: src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr "Uniquement les morceaux dont la durée minimale est la suivante :"
+
+#: src/sid/xmms-sid.glade:2710
+#: src/sid/xs_interface.c:1129
+msgid "Sub-tune handling:"
+msgstr "Gestion des sous-modules :"
+
+#: src/sid/xmms-sid.glade:2755
+#: src/sid/xs_interface.c:1150
+msgid "If this option is enabled (and the database & HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played."
+msgstr "Si cette option est activée (et que la base de données ainsi que les paramètres 'HVSC' ci-dessous sont correctement configurés), 'Audacious-SID' utilisera et affichera des informations supplémentaires, à partir de la base de données 'STIL', lorsque des modules audio 'SID' de la collection 'HVSC' seront lus."
+
+#: src/sid/xmms-sid.glade:2757
+#: src/sid/xs_interface.c:1146
+msgid "Use STIL database"
+msgstr "Utiliser une base de données 'STIL'"
+
+#: src/sid/xmms-sid.glade:2782
+#: src/sid/xs_interface.c:1157
+msgid "STIL file:"
+msgstr "Fichier 'STIL' :"
+
+#: src/sid/xmms-sid.glade:2819
+#: src/sid/xs_interface.c:1173
+msgid "Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory."
+msgstr "Emplacement et nom du fichier de la base de données 'STIL' (le fichier 'STIL.txt' est habituellement situé dans le sous-répertoire 'DOCUMENTS' du dossier 'HVSC')."
+
+#: src/sid/xmms-sid.glade:2854
+#: src/sid/xs_interface.c:1186
+msgid "Browse for STIL-database file"
+msgstr "Permet de parcourir l'arborescence pour sélectionner le fichier de la base de données 'STIL'"
+
+#: src/sid/xmms-sid.glade:2888
+#: src/sid/xs_interface.c:1193
+msgid "HVSC path:"
+msgstr "Emplacement de 'HVSC' :"
+
+#: src/sid/xmms-sid.glade:2925
+#: src/sid/xs_interface.c:1209
+msgid "Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/"
+msgstr "Emplacement du dossier de base de 'High Voltage SID Collection' (HVSC) ('/media/C64Music/', par exemple)"
+
+#: src/sid/xmms-sid.glade:2960
+#: src/sid/xs_interface.c:1222
+msgid "Browse for HVSC path"
+msgstr "Permet de parcourir l'arborescence pour sélectionner le dossier 'HVSC'"
+
+#: src/sid/xmms-sid.glade:2990
+#: src/sid/xs_interface.c:1224
+msgid "SID Tune Information List (STIL) database:"
+msgstr "Base de données 'STIL' (SID Tune Information List) :"
+
+#: src/sid/xmms-sid.glade:3063
+#: src/sid/xs_interface.c:1248
+msgid "Accept and update changes"
+msgstr "Valide et applique les changements"
+
+#: src/sid/xmms-sid.glade:3077
+#: src/sid/xs_interface.c:1255
+msgid "Cancel any changes"
+msgstr "Annule tous les changements"
+
+#: src/sid/xmms-sid.glade:3102
+#: src/sid/xs_interface.c:1543
+msgid "Audacious-SID Fileinfo"
+msgstr "Infomations sur le fichier 'Audacious-SID'"
+
+#: src/sid/xmms-sid.glade:3172
+#: src/sid/xs_interface.c:1572
+msgid "Songname:"
+msgstr "Nom du morceau :"
+
+#: src/sid/xmms-sid.glade:3200
+#: src/sid/xs_interface.c:1580
+msgid "Composer:"
+msgstr "Compositeur :"
+
+#: src/sid/xmms-sid.glade:3228
+#: src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
+msgid "Copyright:"
+msgstr "Droits :"
+
+#: src/sid/xmms-sid.glade:3342
+#: src/sid/xs_interface.c:1632
+msgid "Song Information:"
+msgstr "Informations sur le module :"
+
+#: src/sid/xmms-sid.glade:3416
+#: src/sid/xs_interface.c:1667
+msgid "Author:"
+msgstr "Auteur :"
+
+#: src/sid/xmms-sid.glade:3514
+#: src/sid/xs_interface.c:1701
+msgid "Duration:"
+msgstr "Durée :"
+
+#: src/sid/xmms-sid.glade:3608
+#: src/sid/xs_interface.c:1735
+msgid "Sub-tune Information:"
+msgstr "Informations sur les sous-modules :"
+
+#: src/sid/xmms-sid.glade:3662
+#: src/sid/xs_interface.c:1796
+msgid "Select HVSC song length database"
+msgstr "Choix de la base de données 'HVSC'"
+
+#: src/sid/xmms-sid.glade:3704
+#: src/sid/xs_interface.c:1837
+msgid "Select STIL-database"
+msgstr "Choix de la base de données 'STIL'"
+
+#: src/sid/xmms-sid.glade:3746
+#: src/sid/xs_interface.c:1878
+msgid "Select HVSC location prefix"
+msgstr "Emplacement de 'HVSC'"
+
+#: src/sid/xmms-sid.glade:3788
+#: src/sid/xs_interface.c:1919
+msgid "Select SIDPlay2 filters file for importing"
+msgstr "Fichier de filtres 'SIDPlay2' à importer :"
+
+#: src/sid/xmms-sid.glade:3830
+#: src/sid/xs_interface.c:1960
+msgid "Select SIDPlay2 filters file for exporting"
+msgstr "Fichier de filtres 'SIDPlay2' à exporter :"
+
+#: src/sid/xmms-sid.glade:3871
+#: src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008
+#: src/sid/xs_interface.c:2021
+msgid "Confirm selected action"
+msgstr "Confirmer l'action choisie"
+
+#: src/sid/xmms-sid.glade:3909
+#: src/sid/xs_interface.c:2038
+msgid "Yes"
+msgstr "Oui"
+
+#: src/sid/xmms-sid.glade:3921
+#: src/sid/xs_interface.c:2044
+msgid "No"
+msgstr "Aucun"
+
+#: src/sid/xs_about.c:84
+#: src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "À propos de '%s'"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr "Erreur lors de l'allocation de la structure de 'sid2FilterPresets' !\n"
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr "Avertissement : erreur lors du placement des points de la courbe du filtre !\n"
+
+#: src/sid/xs_fileinfo.c:232
+msgid "General info"
+msgstr "Général"
+
+#: src/sid/xs_fileinfo.c:247
+#, c-format
+msgid "Tune #%i: "
+msgstr "Module #%i : "
+
+#: src/sid/xs_length.c:113
+msgid "Error allocating new node. Fatal error.\n"
+msgstr "Erreur lors de l'allocation du nouveau bloc. Erreur fatale.\n"
+
+#: src/sid/xs_length.c:128
+#, c-format
+msgid "'=' expected on column #%d.\n"
+msgstr "Caractère '=' attendu à la position #%d.\n"
+
+#: src/sid/xs_length.c:153
+msgid "Could not allocate memory for node.\n"
+msgstr "Impossible d'allouer de la mémoire pour le bloc.\n"
+
+#: src/sid/xs_length.c:204
+#, c-format
+msgid "Could not open SongLengthDB '%s'\n"
+msgstr "Impossible d'ouvrir la base de données '%s'\n"
+
+#: src/sid/xs_length.c:224
+#, c-format
+msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
+msgstr "Signature 'MD5' invalide, dans la base de données '%s', à la ligne #%d !\n"
+
+#: src/sid/xs_length.c:231
+#, c-format
+msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
+msgstr "Entrée invalide dans la base de données '%s', à la ligne #%d!\n"
+
+#: src/sid/xs_length.c:236
+#, c-format
+msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
+msgstr "Ligne invalide dans la base de données '%s' (ligne #%d) !\n"
+
+#: src/sid/xs_length.c:398
+#, c-format
+msgid "Not a PSID or RSID file '%s'\n"
+msgstr "Le fichier '%s' n'est pas au format 'PSID' ou 'RSID'\n"
+
+#: src/sid/xs_length.c:417
+#, c-format
+msgid "Error reading SID file header from '%s'\n"
+msgstr "Erreur lors de la lecture de l'en-tête du fichier '%s'\n"
+
+#: src/sid/xs_length.c:436
+#, c-format
+msgid "Error allocating temp data buffer for file '%s'\n"
+msgstr "Erreur lors de l'allocation des données provisoires du tampon relatif au fichier '%s'\n"
+
+#: src/sid/xs_sidplay1.cc:96
+msgid "[SIDPlay1] Could not initialize emulation engine.\n"
+msgstr "[SIDPlay1]  : impossible d'initialiser le moteur de l'émulation.\n"
+
+#: src/sid/xs_sidplay1.cc:103
+msgid "[SIDPlay1] Endianess verification failed.\n"
+msgstr "[SIDPlay1] : erreur lors de la vérification de la méthode d'alignement de données ('endianess').\n"
+
+#: src/sid/xs_sidplay1.cc:238
+msgid "[SIDPlay1] Emulator engine configuration failed!\n"
+msgstr "[SIDPlay1] : échec lors de la configuration du moteur de l'émulation !\n"
+
+#: src/sid/xs_sidplay1.cc:245
+msgid "[SIDPlay1] Could not initialize SIDTune object.\n"
+msgstr "[SIDPlay1] : impossible d'initialiser l'objet 'SIDTune'.\n"
+
+#: src/sid/xs_sidplay1.cc:291
+msgid "[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, report to XMMS-SID author.\n"
+msgstr "[SIDPlay1] : le pointeur de structure du module audio 'SID' a renvoyé 'NULL'. Cette situation ne devrait pas arriver : veuillez en avertir l'auteur de 'XMMS-SID'.\n"
+
+#: src/sid/xs_sidplay1.cc:296
+msgid "[SIDPlay1] SID-tune status check failed. This should not happen, report to XMMS-SID author.\n"
+msgstr "[SIDPlay1] : erreur lors de la vérification de l'état du module audio 'SID'. Cette situation ne devrait pas arriver : veuillez en avertir l'auteur de 'XMMS-SID'.\n"
+
+#: src/sid/xs_sidplay2.cc:101
+msgid "[SIDPlay2] Could not initialize emulation engine.\n"
+msgstr "[SIDPlay2]  : impossible d'initialiser le moteur de l'émulation.\n"
+
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr "[SIDPlay2] : le nombre de points de la courbe du filtre est invalide (%d > %d)\n"
+
+#: src/sid/xs_sidplay2.cc:229
+msgid "reSID->create() failed.\n"
+msgstr "reSID->create() : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:235
+#, c-format
+msgid "reSID->filter(%d) failed.\n"
+msgstr "reSID->filter(%d) : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:243
+#, c-format
+msgid "reSID->sampling(%d) failed.\n"
+msgstr "reSID->sampling(%d) : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:253
+msgid "reSID->filter(NULL) failed.\n"
+msgstr "reSID->filter(NULL) : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:267
+msgid "hardSID->create() failed.\n"
+msgstr "hardSID->create() : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:273
+#, c-format
+msgid "hardSID->filter(%d) failed.\n"
+msgstr "hardSID->filter(%d) : erreur.\n"
+
+#: src/sid/xs_sidplay2.cc:281
+msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
+msgstr "[SIDPlay2] : impossible d'initialiser l'objet 'SIDBuilder'.\n"
+
+#: src/sid/xs_sidplay2.cc:295
+#, c-format
+msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
+msgstr "[SIDPlay2] : vitesse d'horloge invalide (%d) ; utilisation de 'PAL' à la place.\n"
+
+#: src/sid/xs_sidplay2.cc:319
+#, c-format
+msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
+msgstr "Valeur de 'sid2OptLevel' invalide (%d) : utilisation de '%d' à la place.\n"
+
+#: src/sid/xs_sidplay2.cc:343
+msgid "[SIDPlay2] Emulator engine configuration failed!\n"
+msgstr "[SIDPlay2] : erreur lors de la configuration du moteur d'émulation !\n"
+
+#: src/sid/xs_sidplay2.cc:350
+msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
+msgstr "[SIDPlay2] : impossible d'initialiser l'objet 'SIDTune'.\n"
+
+#: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr "[SIDPlay2] currTune->selectSong() : erreur\n"
+
+#: src/sid/xs_sidplay2.cc:406
+msgid "[SIDPlay2] currEng->load() failed\n"
+msgstr "[SIDPlay2] currEng->load() : erreur\n"
+
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr "Impossible d'allouer de la mémoire pour t_xs_tuneinfo ('%s')\n"
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr "Erreur lors de l'allocation du fichier 'SID' ('%s').\n"
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr "Impossible d'allouer de la mémoire pour t_xs_subtuneinfo ('%s', %i)\n"
+
+#: src/sid/xs_stil.c:46
+msgid "SubTune pointer structure realloc failed.\n"
+msgstr "Erreur lors du redimensionnement de l'allocation de mémoire dynamique du pointeur de structure 'SubTune'.\n"
+
+#: src/sid/xs_stil.c:69
+msgid "SubTune structure malloc failed!\n"
+msgstr "Erreur lors de l'allocation de mémoire dynamique de la structure 'SubTune' !\n"
+
+#: src/sid/xs_stil.c:176
+#, c-format
+msgid "Could not open STILDB '%s'\n"
+msgstr "Impossible d'ouvrir la base de données STILDB '%s'\n"
+
+#: src/sndstretch/sndstretch_xmms.c:159
+msgid "About SndStretch"
+msgstr "À propos de 'SndStretch'"
+
+#: src/sndstretch/sndstretch_xmms.c:319
+msgid "Volume corr."
+msgstr "Correction du volume"
+
+#: src/sndstretch/sndstretch_xmms.c:320
+msgid "Short Overlap"
+msgstr "Chevauchement léger"
+
+#: src/sndstretch/sndstretch_xmms.c:374
+msgid "Speed"
+msgstr "Vitesse"
+
+#: src/sndstretch/sndstretch_xmms.c:375
+msgid "Pitch"
+msgstr "Hauteur"
+
+#: src/sndstretch/sndstretch_xmms.c:376
+msgid "Scale"
+msgstr "Échelle"
+
+#: src/sndstretch/sndstretch_xmms.c:396
+msgid "SndStretch - Configuration"
+msgstr "Configuration de 'SndStretch'"
+
+#: src/song_change/song_change.c:316
+msgid "Commands"
+msgstr "Commandes"
+
+#: src/song_change/song_change.c:323
+msgid "Command to run when Audacious starts a new song."
+msgstr "Commande à exécuter lorsqu'un nouveau morceau commence :"
+
+#: src/song_change/song_change.c:332
+#: src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375
+#: src/song_change/song_change.c:396
+msgid "Command:"
+msgstr "Commande :"
+
+#: src/song_change/song_change.c:346
+msgid "Command to run toward the end of a song."
+msgstr "Commande à exécuter lorsque la lecture d'un morceau se termine :"
+
+#: src/song_change/song_change.c:366
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Commande à exécuter lorsque la fin de la liste de lecture est atteinte :"
+
+#: src/song_change/song_change.c:387
+msgid "Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "Commande à exécuter lorsque le titre d'un morceau change (le titre des flux distants, par exemple) :"
+
+#: src/song_change/song_change.c:408
+#, c-format
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%%F: Frequency (in hertz)\n"
+"%%c: Number of channels\n"
+"%%f: filename (full path)\n"
+"%%l: length (in milliseconds)\n"
+"%%n or %%s: Song name\n"
+"%%r: Rate (in bits per second)\n"
+"%%t: Playlist position (%%02d)\n"
+"%%p: Currently playing (1 or 0)"
+msgstr ""
+"Vous pouvez utiliser les chaînes de la liste ci-dessous.\n"
+"Elles seront remplacées avant l'appel de la commande à exécuter\n"
+"(toutes ne sont pas utiles pour la fonction 'fin de liste') :\n"
+"\n"
+"%%F: Fréquence (en Hertz)\n"
+"%%c: Nombre de voies\n"
+"%%f: Nom du fichier (chemin complet)\n"
+"%%l: Durée (en millisecondes)\n"
+"%%n ou %%s: Titre du morceau\n"
+"%%r: Taux d'encodage (en bits par seconde)\n"
+"%%t: Position dans la liste de lecture (%%02d)\n"
+"%%p: Statut de la lecture (1 ou 0)"
+
+#: src/song_change/song_change.c:433
+msgid "<span size='small'>Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk.</span>"
+msgstr ""
+"<span size='small'>Les arguments à lancer dans la console doivent être entourés de guillemets.\n"
+"Une utilisation différente constitue un risque en matière de sécurité.</span>"
+
+#: src/spectrum/spectrum.c:90
+msgid "Spectrum Analyzer"
+msgstr "Analyseur Spectral"
+
+#: src/statusicon/gtktrayicon-x11.c:133
+msgid "Orientation"
+msgstr "Orientation"
+
+#: src/statusicon/gtktrayicon-x11.c:134
+msgid "The orientation of the tray"
+msgstr "Définit l'orientation de l'icône"
+
+#: src/statusicon/si_ui.c:571
+msgid "About Status Icon Plugin"
+msgstr "À propos du module 'Status Icon'"
+
+#: src/statusicon/si_ui.c:573
+msgid ""
+"\n"
+"written by Giacomo Lozito < james@develia.org >\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr ""
+"\n"
+"Écrit par Giacomo Lozito < james@develia.org >\n"
+"\n"
+"Ce module affiche une icône de statut dans la\n"
+"boîte de notification du gestionnaire de fenêtres.\n"
+
+#: src/statusicon/si_ui.c:645
+msgid "Status Icon Plugin - Preferences"
+msgstr "Préférences de 'Status Icon'"
+
+#: src/statusicon/si_ui.c:656
+msgid "Right-Click Menu"
+msgstr "Menu disponible via le clic droit :"
+
+#: src/statusicon/si_ui.c:661
+msgid "Audacious standard menu"
+msgstr "Menu standard d'Audacious"
+
+#: src/statusicon/si_ui.c:666
+msgid "Small playback menu #1"
+msgstr "Menu de lecture compact #1"
+
+#: src/statusicon/si_ui.c:671
+msgid "Small playback menu #2"
+msgstr "Menu de lecture compact #2"
+
+#: src/statusicon/si_ui.c:694
+msgid "Mouse Scroll Action"
+msgstr "Effet du défilement de la souris :"
+
+#: src/statusicon/si_ui.c:699
+msgid "Change volume"
+msgstr "Changement du volume"
+
+#: src/statusicon/si_ui.c:704
+msgid "Change playing song"
+msgstr "Changement du titre en cours de lecture"
+
+#: src/stereo_plugin/stereo.c:26
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr ""
+"Module 'Extra Stereo'\n"
+"\n"
+"Écrit par Johan Levin (1999)."
+
+#: src/stereo_plugin/stereo.c:52
+msgid "About Extra Stereo Plugin"
+msgstr "À propos..."
+
+#: src/stereo_plugin/stereo.c:93
+msgid "Configure Extra Stereo"
+msgstr "Configurer 'Extra Stereo'"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Effect intensity:"
+msgstr "Intensité de l'effet :"
+
+#: src/sun/about.c:34
+msgid "About the Sun Driver"
+msgstr "À propos du pilote 'Sun'"
+
+#: src/sun/about.c:35
+msgid ""
+"XMMS BSD Sun Driver\n"
+"\n"
+"Copyright (c) 2001 CubeSoft Communications, Inc.\n"
+"Maintainer: <vedge at csoft.org>.\n"
+msgstr ""
+"Pilote 'Sun BSD' pour XMMS\n"
+"\n"
+"Droits d'utilisation :\n"
+"(c) 2001, CubeSoft Communications, Inc.\n"
+"\n"
+"Responsable de la maintenance :\n"
+"<vedge at csoft.org>.\n"
+
+#: src/sun/configure.c:201
+msgid "Audio control device:"
+msgstr "Périphérique de contrôle audio :"
+
+#: src/sun/configure.c:350
+msgid "Volume controls device:"
+msgstr "Périphérique de contrôle du volume :"
+
+#: src/sun/configure.c:363
+msgid "XMMS uses mixer exclusively."
+msgstr "XMMS utilise le mélangeur audio de manière exclusive."
+
+#: src/sun/configure.c:538
+msgid "Sun driver configuration"
+msgstr "Configuration du pilote 'Sun'"
+
+#: src/timidity/interface.c:54
+msgid "TiMidity Configuration"
+msgstr "Configuration de 'TiMidity'"
+
+#: src/timidity/interface.c:91
+msgid "11000 Hz"
+msgstr "11000 Hz"
+
+#: src/timidity/interface.c:99
+msgid "22000 Hz"
+msgstr "22000 Hz"
+
+#: src/timidity/interface.c:107
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/timidity/interface.c:115
+msgid "Sample Width"
+msgstr "Résolution"
+
+#: src/timidity/interface.c:181
+msgid "TiMidity Configuration File"
+msgstr "Fichier de configuration de 'TiMidity'"
+
+#: src/timidity/xmms-timidity.c:115
+msgid ""
+"TiMidity Plugin\n"
+"http://libtimidity.sourceforge.net\n"
+"by Konstantin Korikov"
+msgstr ""
+"Module 'TiMidity'\n"
+"\n"
+"http://libtimidity.sourceforge.net\n"
+"\n"
+"Écrit par Konstantin Korikov"
+
+#: src/timidity/xmms-timidity.c:116
+#, c-format
+msgid "TiMidity Plugin %s"
+msgstr "Module 'TiMidity' %s"
+
+#: src/timidity/xmms-timidity.c:333
+msgid "Couldn't load MIDI file"
+msgstr "Impossible de lire le fichier MIDI"
+
+#: src/tonegen/tonegen.c:56
+msgid "About Tone Generator"
+msgstr "À propos de 'Tone Generator'"
+
+#: src/tonegen/tonegen.c:58
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr ""
+"Générateur de sons sinusoïdaux écrit par Haavard Kvaalen <havardk@xmms.org>\n"
+"\n"
+"Modifié par Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Pour utiliser ce module, il suffit d'ajouter une adresse du type :\n"
+"tone://fréquence1;fréquence2;fréquence3;...\n"
+"\n"
+"Par exemple, 'tone://2000;2005' émettra un son de 2000 Hz et un son de 2005 Hz."
+
+#: src/tonegen/tonegen.c:168
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:168
+msgid "Tone Generator: "
+msgstr "Générateur de sons : "
+
+#: src/tta/libtta.c:128
+msgid "Can't open file\n"
+msgstr "Impossible d'ouvrir le fichier\n"
+
+#: src/tta/libtta.c:131
+msgid "Not supported file format\n"
+msgstr "Le format du fichier n'est pas supporté\n"
+
+#: src/tta/libtta.c:134
+msgid "File is corrupted\n"
+msgstr "Le fichier est corrompu\n"
+
+#: src/tta/libtta.c:137
+msgid "Can't read from file\n"
+msgstr "Impossible de lire le fichier\n"
+
+#: src/tta/libtta.c:140
+msgid "Insufficient memory available\n"
+msgstr "La mémoire disponible est insuffisante\n"
+
+#: src/tta/libtta.c:143
+msgid "Output plugin error\n"
+msgstr "Erreur relative au module de sortie\n"
+
+#: src/tta/libtta.c:146
+msgid "Unknown error\n"
+msgstr "Erreur inconnue\n"
+
+#: src/tta/libtta.c:150
+msgid "TTA Decoder Error"
+msgstr "Erreur du décodeur 'TTA'"
+
+#: src/tta/libtta.c:259
+msgid "TTA input plugin "
+msgstr "Module d'entrée 'TTA' "
+
+#: src/tta/libtta.c:260
+msgid ""
+" for BMP\n"
+"Copyright (c) 2004 True Audio Software\n"
+msgstr ""
+" pour BMP\n"
+"\n"
+"Droits d'utilisation (2004) :\n"
+"\n"
+"True Audio Software\n"
+
+#: src/tta/libtta.c:263
+msgid "About True Audio Plugin"
+msgstr "À propos du module 'True Audio'"
+
+#: src/tta/libtta.c:314
+msgid "ID3 Tag:"
+msgstr "Métadonnées ID3"
+
+#: src/vorbis/configure.c:115
+msgid "Ogg Vorbis Audio Plugin Configuration"
+msgstr "Configuration du module audio 'Ogg Vorbis'"
+
+#: src/vorbis/configure.c:127
+msgid "Ogg Vorbis Tags:"
+msgstr "Métadonnées 'Ogg Vorbis' :"
+
+#: src/vorbis/configure.c:148
+msgid "Title format:"
+msgstr "Format du titre :"
+
+#: src/vorbis/configure.c:162
+#: src/wavpack/ui.cxx:500
+msgid "ReplayGain Settings:"
+msgstr "Paramètres de 'ReplayGain' :"
+
+#: src/vorbis/configure.c:180
+#: src/wavpack/ui.cxx:518
+msgid "ReplayGain Type:"
+msgstr "Traitement 'ReplayGain' :"
+
+#: src/vorbis/configure.c:191
+#: src/wavpack/ui.cxx:529
+msgid "use Track Gain/Peak"
+msgstr "Utiliser le gain/pic sonore 'piste'"
+
+#: src/vorbis/configure.c:201
+#: src/wavpack/ui.cxx:537
+msgid "use Album Gain/Peak"
+msgstr "Utiliser le gain/pic sonore 'album'"
+
+#: src/vorbis/configure.c:213
+msgid "Enable 6dB Boost + Hard Limiting"
+msgstr "Activer le gain de 6 dB et le limiteur de pics sonores"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Blues"
+msgstr "Blues"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Classic Rock"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Country"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Dance"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disco"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Funk"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-Hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Oldies"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Other"
+msgstr "Other"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
+
+#: src/vorbis/fileinfo.c:83
+msgid "R&B"
+msgstr "R&B"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Rock"
+msgstr "Rock"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Techno"
+msgstr "Techno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Pranks"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vocal"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Jazz+Funk"
+msgstr "Jazz+Funk"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Fusion"
+msgstr "Fusion"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Trance"
+msgstr "Trance"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Classical"
+msgstr "Classical"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Instrumental"
+msgstr "Instrumental"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Acid"
+msgstr "Acid"
+
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Game"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Noise Clip"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Noise"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "AlternRock"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bass"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Space"
+
+#: src/vorbis/fileinfo.c:91
+msgid "Meditative"
+msgstr "Meditative"
+
+#: src/vorbis/fileinfo.c:91
+msgid "Instrumental Pop"
+msgstr "Instrumental Pop"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Instrumental Rock"
+msgstr "Instrumental Rock"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Ethnic"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gothic"
+
+#: src/vorbis/fileinfo.c:93
+msgid "Darkwave"
+msgstr "Darkwave"
+
+#: src/vorbis/fileinfo.c:93
+msgid "Techno-Industrial"
+msgstr "Techno-Industrial"
+
+#: src/vorbis/fileinfo.c:93
+msgid "Electronic"
+msgstr "Electronic"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Dream"
+msgstr "Dream"
+
+#: src/vorbis/fileinfo.c:95
+msgid "Southern Rock"
+msgstr "Southern Rock"
+
+#: src/vorbis/fileinfo.c:95
+msgid "Comedy"
+msgstr "Comedy"
+
+#: src/vorbis/fileinfo.c:95
+msgid "Cult"
+msgstr "Cult"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Gangsta Rap"
+msgstr "Gangsta Rap"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Top 40"
+msgstr "Top 40"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Christian Rap"
+msgstr "Christian Rap"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Pop/Funk"
+msgstr "Pop/Funk"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Jungle"
+msgstr "Jungle"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Native American"
+msgstr "Native American"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Cabaret"
+msgstr "Cabaret"
+
+#: src/vorbis/fileinfo.c:98
+msgid "New Wave"
+msgstr "New Wave"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelic"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Trailer"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid Punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Musical"
+msgstr "Musical"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Rock & Roll"
+msgstr "Rock & Roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
+
+#: src/vorbis/fileinfo.c:102
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
+
+#: src/vorbis/fileinfo.c:102
+msgid "National Folk"
+msgstr "National Folk"
+
+#: src/vorbis/fileinfo.c:102
+msgid "Swing"
+msgstr "Swing"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Bebob"
+msgstr "Bebob"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Latin"
+msgstr "Latin"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Celtic"
+msgstr "Celtic"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Bluegrass"
+msgstr "Bluegrass"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Avantgarde"
+msgstr "Avantgarde"
+
+#: src/vorbis/fileinfo.c:105
+msgid "Gothic Rock"
+msgstr "Gothic Rock"
+
+#: src/vorbis/fileinfo.c:105
+msgid "Progressive Rock"
+msgstr "Progressive Rock"
+
+#: src/vorbis/fileinfo.c:106
+msgid "Psychedelic Rock"
+msgstr "Psychedelic Rock"
+
+#: src/vorbis/fileinfo.c:106
+msgid "Symphonic Rock"
+msgstr "Symphonic Rock"
+
+#: src/vorbis/fileinfo.c:106
+msgid "Slow Rock"
+msgstr "Slow Rock"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chorus"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Acoustic"
+msgstr "Acoustic"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Humour"
+msgstr "Humour"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Speech"
+msgstr "Speech"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Chanson"
+msgstr "Chanson"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Opera"
+msgstr "Opera"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Chamber Music"
+msgstr "Chamber Music"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Sonata"
+msgstr "Sonata"
+
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Symphony"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Satire"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Club"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folklore"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Ballad"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Power Ballad"
+
+#: src/vorbis/fileinfo.c:113
+msgid "Rhythmic Soul"
+msgstr "Rhythmic Soul"
+
+#: src/vorbis/fileinfo.c:113
+msgid "Freestyle"
+msgstr "Freestyle"
+
+#: src/vorbis/fileinfo.c:113
+msgid "Duet"
+msgstr "Duet"
+
+#: src/vorbis/fileinfo.c:114
+msgid "Punk Rock"
+msgstr "Punk Rock"
+
+#: src/vorbis/fileinfo.c:114
+msgid "Drum Solo"
+msgstr "Drum Solo"
+
+#: src/vorbis/fileinfo.c:114
+msgid "A Cappella"
+msgstr "A Cappella"
+
+#: src/vorbis/fileinfo.c:115
+msgid "Euro-House"
+msgstr "Euro-House"
+
+#: src/vorbis/fileinfo.c:115
+msgid "Dance Hall"
+msgstr "Dance Hall"
+
+#: src/vorbis/fileinfo.c:115
+msgid "Goa"
+msgstr "Goa"
+
+#: src/vorbis/fileinfo.c:116
+msgid "Drum & Bass"
+msgstr "Drum & Bass"
+
+#: src/vorbis/fileinfo.c:116
+msgid "Club-House"
+msgstr "Club-House"
+
+#: src/vorbis/fileinfo.c:116
+msgid "Hardcore"
+msgstr "Hardcore"
+
+#: src/vorbis/fileinfo.c:117
+msgid "Terror"
+msgstr "Terror"
+
+#: src/vorbis/fileinfo.c:117
+msgid "Indie"
+msgstr "Indie"
+
+#: src/vorbis/fileinfo.c:117
+msgid "BritPop"
+msgstr "BritPop"
+
+#: src/vorbis/fileinfo.c:117
+msgid "Negerpunk"
+msgstr "Negerpunk"
+
+#: src/vorbis/fileinfo.c:118
+msgid "Polsk Punk"
+msgstr "Polsk Punk"
+
+#: src/vorbis/fileinfo.c:118
+msgid "Beat"
+msgstr "Beat"
+
+#: src/vorbis/fileinfo.c:118
+msgid "Christian Gangsta Rap"
+msgstr "Christian Gangsta Rap"
+
+#: src/vorbis/fileinfo.c:119
+msgid "Heavy Metal"
+msgstr "Heavy Metal"
+
+#: src/vorbis/fileinfo.c:119
+msgid "Black Metal"
+msgstr "Black Metal"
+
+#: src/vorbis/fileinfo.c:119
+msgid "Crossover"
+msgstr "Crossover"
+
+#: src/vorbis/fileinfo.c:120
+msgid "Contemporary Christian"
+msgstr "Contemporary Christian"
+
+#: src/vorbis/fileinfo.c:120
+msgid "Christian Rock"
+msgstr "Christian Rock"
+
+#: src/vorbis/fileinfo.c:121
+msgid "Merengue"
+msgstr "Merengue"
+
+#: src/vorbis/fileinfo.c:121
+msgid "Salsa"
+msgstr "Salsa"
+
+#: src/vorbis/fileinfo.c:121
+msgid "Thrash Metal"
+msgstr "Thrash Metal"
+
+#: src/vorbis/fileinfo.c:122
+msgid "Anime"
+msgstr "Anime"
+
+#: src/vorbis/fileinfo.c:122
+msgid "JPop"
+msgstr "JPop"
+
+#: src/vorbis/fileinfo.c:122
+msgid "Synthpop"
+msgstr "Synthpop"
+
+#: src/vorbis/fileinfo.c:207
+#, c-format
+msgid ""
+"An error occured:\n"
+"%s"
+msgstr ""
+"Une erreur s'est peoduite : \n"
+"%s"
+
+#: src/vorbis/fileinfo.c:209
+msgid "Error!"
+msgstr "Erreur !"
+
+#: src/vorbis/fileinfo.c:241
+msgid "Failed to modify tag (open)"
+msgstr "Erreur lors de la lecture des métadonnées"
+
+#: src/vorbis/fileinfo.c:294
+msgid "Failed to modify tag (close)"
+msgstr "Erreur lors de l'écriture des métadonnées"
+
+#: src/vorbis/fileinfo.c:321
+#: src/vorbis/fileinfo.c:330
+msgid "Failed to modify tag"
+msgstr "Erreur lors de la modification des métadonnées"
+
+#: src/vorbis/fileinfo.c:574
+msgid " Ogg Vorbis Tag "
+msgstr " Métadonnées 'Ogg Vorbis' "
+
+#: src/vorbis/fileinfo.c:626
+msgid "Date:"
+msgstr "Date :"
+
+#: src/vorbis/fileinfo.c:668
+msgid "Description:"
+msgstr "Description :"
+
+#: src/vorbis/fileinfo.c:678
+msgid "Location:"
+msgstr "Emplacement :"
+
+#: src/vorbis/fileinfo.c:688
+msgid "Version:"
+msgstr "Version :"
+
+#: src/vorbis/fileinfo.c:699
+msgid "ISRC number:"
+msgstr "Identifiant 'ISRC' :"
+
+#: src/vorbis/fileinfo.c:710
+msgid "Organization:"
+msgstr "Société :"
+
+#: src/vorbis/fileinfo.c:757
+msgid " Ogg Vorbis ReplayGain "
+msgstr " ReplayGain Ogg Vorbis "
+
+#: src/vorbis/fileinfo.c:763
+msgid "Track gain:"
+msgstr "Gain 'piste' :"
+
+#: src/vorbis/fileinfo.c:773
+msgid "Track peak:"
+msgstr "Pic sonore 'piste' :"
+
+#: src/vorbis/fileinfo.c:784
+msgid "Album gain:"
+msgstr "Gain 'album' :"
+
+#: src/vorbis/fileinfo.c:794
+msgid "Album peak:"
+msgstr "Pic sonore 'album' :"
+
+#: src/vorbis/fileinfo.c:823
+msgid " Ogg Vorbis Info "
+msgstr " Informations 'Ogg Vorbis' "
+
+#: src/vorbis/fileinfo.c:838
+#: src/vorbis/fileinfo.c:915
+msgid "Bit rate:"
+msgstr "Débit :"
+
+#: src/vorbis/fileinfo.c:851
+#: src/vorbis/fileinfo.c:918
+msgid "Sample rate:"
+msgstr "Taux d'échantillonnage :"
+
+#: src/vorbis/fileinfo.c:877
+#: src/vorbis/fileinfo.c:924
+msgid "Length:"
+msgstr "Durée :"
+
+#: src/vorbis/fileinfo.c:890
+#: src/vorbis/fileinfo.c:927
+msgid "File size:"
+msgstr "Taille du fichier :"
+
+#: src/vorbis/fileinfo.c:916
+#: src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922
+#: src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
+msgid "N/A"
+msgstr "non disponible"
+
+#: src/vorbis/fileinfo.c:958
+#, c-format
+msgid "%d KBit/s (nominal)"
+msgstr "%d kbit/s (nominal)"
+
+#: src/vorbis/fileinfo.c:960
+#, c-format
+msgid "%d"
+msgstr "%d"
+
+#: src/vorbis/fileinfo.c:962
+#, c-format
+msgid "%d:%.2d"
+msgstr "%d:%.2d"
+
+#: src/vorbis/fileinfo.c:964
+#, c-format
+msgid "%d Bytes"
+msgstr "%d Bytes"
+
+#: src/vorbis/fileinfo.c:1021
+#, c-format
+msgid "%s - Audacious"
+msgstr "Audacious : %s"
+
+#: src/vorbis/vorbis.c:845
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "À propos du module audio 'Ogg Vorbis'"
+
+#: src/vorbis/vorbis.c:851
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\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"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr ""
+"Module 'Ogg Vorbis' de 'Xiph.org Foundation'\n"
+"\n"
+"\n"
+"Code original :\n"
+"Tony Arcieri                <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions :\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"
+"Haavard Kvaalen      <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto  <gcp@sjeng.org>\n"
+"\n"
+"\n"
+"Vous pouvez visiter 'Xiph.org Foundation' à cette adresse :\n"
+"http://www.xiph.org/\n"
+
+#: src/vtx/about.c:22
+msgid "About Vortex Player"
+msgstr "À propos du lecteur 'Vortex'"
+
+#: src/vtx/about.c:24
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Lecteur de fichiers au format 'Vortex' de\n"
+"Sashnov Alexander <sashnov@ngs.ru>\n"
+"\n"
+"Source originale : 'in_vtx.dll' de\n"
+"Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"La musique au format 'vtx' peut être trouvée à l'adresse suivante :\n"
+"\n"
+"http://vtx.microfor.ru/music.htm\n"
+"(et sur les autres sites de musique AY/YM).\n"
+"\n"
+"Adaptation pour Audacious :\n"
+"Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/ui.cxx:52
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Module de décodage 'Wavpack' %s"
+
+#: src/wavpack/ui.cxx:53
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr ""
+"Droits d'utilisation (2006) : William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Une partie du code provient de Miles Egan\n"
+"\n"
+"Vous pouvez visiter le site 'Wavpack' à l'adresse suivante :\n"
+"http://www.wavpack.com/\n"
+
+#: src/wavpack/ui.cxx:163
+msgid "Ape2 Tag"
+msgstr "Métadonnées 'Ape2'"
+
+#: src/wavpack/ui.cxx:286
+msgid "Wavpack Info:"
+msgstr "Informations Wavpack"
+
+#: src/wavpack/ui.cxx:379
+#, c-format
+msgid "version %d"
+msgstr "Version : %d"
+
+#: src/wavpack/ui.cxx:380
+#, c-format
+msgid "average bitrate: %6.1f kbps"
+msgstr "Débit moyen : %6.1f kbps"
+
+#: src/wavpack/ui.cxx:381
+#, c-format
+msgid "samplerate: %d Hz"
+msgstr "Taux d'échantillonnage : %d Hz"
+
+#: src/wavpack/ui.cxx:382
+#, c-format
+msgid "bits per sample: %d"
+msgstr "Bits par échantillon : %d"
+
+#: src/wavpack/ui.cxx:383
+#, c-format
+msgid "channels: %d"
+msgstr "Voies : %d"
+
+#: src/wavpack/ui.cxx:384
+#, c-format
+msgid "length: %d:%.2d"
+msgstr "Durée : %d:%.2d"
+
+#: src/wavpack/ui.cxx:385
+#, c-format
+msgid "file size: %d Bytes"
+msgstr "Taille du fichier : %d Bytes"
+
+#: src/wavpack/ui.cxx:392
+msgid "Title Peak: ?"
+msgstr "Pic sonore 'piste' : ?"
+
+#: src/wavpack/ui.cxx:393
+msgid "Album Peak: ?"
+msgstr "Pic sonore 'album' : ?"
+
+#: src/wavpack/ui.cxx:394
+msgid "Title Gain: ?"
+msgstr "Gain 'piste' : ?"
+
+#: src/wavpack/ui.cxx:395
+msgid "Album Gain: ?"
+msgstr "Gain 'album' : ?"
+
+#: src/wavpack/ui.cxx:469
+msgid "Wavpack Configuration"
+msgstr "Configuration de 'Wavpack'"
+
+#: src/wavpack/ui.cxx:482
+msgid "General Plugin Settings:"
+msgstr "Réglages généraux"
+
+#: src/wav/wav-sndfile.c:526
+msgid "About sndfile WAV support"
+msgstr "À propos du support WAV 'sndfile'"
+
+#: src/wav/wav-sndfile.c:527
+msgid ""
+"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
+"from the xmms_sndfile plugin which is:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\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.  \n"
+"See the GNU General Public License for more details. \n"
+"\n"
+"You should have received a copy of the GNU General Public \n"
+"License along with this program ; if not, write to \n"
+"the Free Software Foundation, Inc., \n"
+"51 Franklin Street, Fifth Floor, \n"
+"Boston, MA  02110-1301  USA"
+msgstr ""
+"Adapté pour Audacious par Tony Vroon <chainsaw@gentoo.org>\n"
+"à partir du module 'xmms_sndfile' de Erik de Castro Lopo\n"
+"(Droits d'utilisation 2000, 2002)\n"
+"\n"
+"\n"
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la Licence Publique Générale GNU publiée par\n"
+"la Free Software Foundation (version 2 ou bien toute autre version\n"
+"ultérieure choisie par vous).\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS\n"
+"AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties\n"
+"de commercialisation ou d'adaptation dans un but spécifique.\n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, écrivez à la\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
+"MA 02110-1301, États-Unis."
+
+#: src/wav/wav-sndfile.c:551
+msgid "sndfile WAV plugin"
+msgstr "sndfile WAV plugin"
+
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+"Adapté pour Audacious par Tony Vroon (chainsaw@gentoo.org), à partir des modules\n"
+"'BEEP-WMA' - Droits d'utilisation (2004, 2005) : Mokrushin I.V., connu sous 'McMCC' <mcmcc@mail.ru>)\n"
+"'BMP-WMA'  - Droits d'utilisation (2004)           : Roman Bogorodskiy <bogorodskiy@inbox.ru>).\n"
+"Ce module est basé sur le code source de la bibliothèque "
--- a/po/ja.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/ja.po	Thu Nov 01 15:38:07 2007 +0100
@@ -13,19 +13,19 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins HEAD\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
-"PO-Revision-Date: 2007-09-10 09:42+0900\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
+"PO-Revision-Date: 2007-10-21 18:38+0900\n"
 "Last-Translator: dai <d+po@vdr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr "libfaad2-"
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
@@ -35,39 +35,39 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 msgid "About MP4 AAC player plugin"
 msgstr "MP4 AAC プレイヤプラグインについて"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "OK"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "プラグインについて"
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -89,62 +89,65 @@
 "リを用いている.\n"
 "リンクしている AdPlug ライブラリのヴァージョン: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 msgid "AdPlug :: Configuration"
 msgstr "AdPlug :: 設定"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "一般"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 msgid "Sound quality"
 msgstr "音質"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "解像度"
 
+#: src/adplug/adplug-xmms.cc:308
+msgid "8bit"
+msgstr " 8ビット"
+
 #: src/adplug/adplug-xmms.cc:313
-msgid "8bit"
-msgstr " 8ビット"
-
-#: src/adplug/adplug-xmms.cc:318
 msgid "16bit"
 msgstr "16ビット"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "チャンネル数"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "モノラル"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
@@ -152,20 +155,20 @@
 "必要でないならば, ステレオ設定は推奨しません. OPL2 は単にモノラルなので, サウ"
 "ンドにステレオエフェクトはかかりませんが, より CPU パワーを消費します!"
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr "周波数"
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "演奏"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr "曲の終わりを検出する"
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
@@ -174,23 +177,23 @@
 "有効ならば, XMMS は曲の終わりを検出し, 曲を停止してプレイリストを進みます. 無"
 "効ならば, XMMS は曲の終わりを通知せずに, 曲全体を何度も繰り返します. "
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 msgid "Formats"
 msgstr "フォーマット"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr "フォーマット選択"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Format"
 msgstr "フォーマット"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr "拡張子"
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
@@ -200,88 +203,88 @@
 "されていないタイプは, このプラグインからは無視され, 他のプラグインによって再"
 "生されます. "
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr "AdPlug :: ファイル情報"
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 msgid "Title: "
 msgstr "タイトル: "
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr "作者: "
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 msgid "File Type: "
 msgstr "ファイルタイプ: "
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr "サブソング: "
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 msgid "Instruments: "
 msgstr "楽器: "
 
+#: src/adplug/adplug-xmms.cc:566
+msgid "Orders: "
+msgstr "順序: "
+
+#: src/adplug/adplug-xmms.cc:567
+msgid "Patterns: "
+msgstr "パターン: "
+
 #: src/adplug/adplug-xmms.cc:571
-msgid "Orders: "
-msgstr "順序: "
-
-#: src/adplug/adplug-xmms.cc:572
-msgid "Patterns: "
-msgstr "パターン: "
-
-#: src/adplug/adplug-xmms.cc:576
 msgid "Song"
 msgstr "曲"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 msgid "Instrument name"
 msgstr "楽器名"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 msgid "Song message"
 msgstr "曲メッセージ"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr "サブソング選択"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr "順序: "
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr "パターン: "
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr "列: "
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 msgid "Speed: "
 msgstr "早さ: "
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 msgid "Timer: "
 msgstr "タイマー: "
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 msgid "About Apple Lossless Audio Plugin"
 msgstr "Apple Lossless オーディオプラグインについて"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
@@ -289,15 +292,15 @@
 "Copyright (c) 2006 Audacious team\n"
 "(c) 2005-2006 David Hammerton <crazney -at- crazney.net> によるポート"
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr "XMMS アラームについて"
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr "XMMS アラーム"
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -317,42 +320,44 @@
 "\n"
 "http://www.snika.uklinux.net/xmms-alarm/"
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "閉じる"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr "アラーム"
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr "目覚ましです."
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr "プレイリストの選択"
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr "ごめんなさい"
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr "警告"
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -373,155 +378,155 @@
 "--\n"
 "Adam"
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr "わかりました"
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 msgid "Alarm Settings"
 msgstr "アラーム設定"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 msgid "Time"
 msgstr "時間"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 msgid "hours"
 msgstr "時"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr "時"
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr "分"
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 msgid "Quiet after:"
 msgstr "静かになるまで:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr "アラーム(デフォルト):"
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr "アラームを鳴らす曜日の選択"
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "デフォルト"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr "曜日"
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr "火"
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr "水"
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr "木"
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr "金"
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr "土"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 msgid "Sunday"
 msgstr "日"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 msgid "Monday"
 msgstr "月"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr "曜日"
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 msgid "Fading"
 msgstr "フェーディング"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr "現在の値"
 
-#: src/alarm/interface.c:1130
+#: src/alarm/interface.c:1128
 msgid "reset to current output volume"
 msgstr "現在の出力音量にリセット"
 
-#: src/alarm/interface.c:1132
+#: src/alarm/interface.c:1130
 msgid "Start at"
 msgstr "開始"
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 msgid "Final"
 msgstr "最終"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr "追加コマンド"
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 msgid "enable"
 msgstr "有効"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr "プレイリスト (オプショナル)"
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr "参照..."
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 msgid "Reminder"
 msgstr "リマインダ"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 msgid "Use reminder"
 msgstr "リマインダを使う"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 msgid "Options"
 msgstr "オプション"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr "オプションの意味"
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -627,15 +632,15 @@
 "    これを利用するにはボックス内にリマインダを書き\n"
 "    トグルボタンを有効にします.\n"
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr "今日のリマインダは.."
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 msgid "Thankyou"
 msgstr "ありがとう"
 
@@ -681,57 +686,53 @@
 "USA. へ手紙を書いて下さい.\n"
 "作者: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "不明なサウンドカード"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "デフォルト PCM デバイス (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "ALSA ドライバ設定"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "オーディオデバイス:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "ミキサ:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "ソフトウェア音量コントロールを使う"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "ミキサカード:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "デバイス設定:"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "サウンドカード:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "バッファ時間 (ミリ秒):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "休止時間 (ミリ秒):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "高度な設定"
 
@@ -1432,8 +1433,8 @@
 "<span size=\"smaller\">TiMidity\n"
 "バックエンド</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "名前:"
 
@@ -1555,23 +1556,23 @@
 msgid "Concave Rectangle"
 msgstr "凹矩形"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "なし"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "演奏開始"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "演奏開始"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "プレイリストのエントリが演奏されたら OSD が動作します."
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "タイトル変更"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
@@ -1581,27 +1582,27 @@
 "す. これはインターネットストリームのタイトル変更を表示するのにとても役立ちま"
 "す."
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 msgid "Volume Change"
 msgstr "音量変更"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr "音量が変更されたら OSD が動作します."
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Pause On"
 msgstr "演奏停止"
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr "演奏が停止されたら OSD が動作します."
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Pause Off"
 msgstr "演奏再開"
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr "演奏が再開されたら OSD が動作します."
 
@@ -1679,47 +1680,47 @@
 msgid "Select Skin File"
 msgstr "スキンファイル選択"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "描画形式"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "色"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, c-format
 msgid "Color %i:"
 msgstr "色 %i:"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "カスタムスキン"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr "スキンファイル:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "参照"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "トリガー有効"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "イベント"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr "Composite マネージャが検出されました"
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1729,73 +1730,74 @@
 "動作させているかわからなければ, Composite マネージャを有効にしてください. そ"
 "うしなければ OSD は正常に動作しないでしょう."
 
-#: src/aosd/aosd_ui.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite マネージャは偽の透明化には必要ではありません"
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr "透明化"
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr "偽の透明化"
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真の透明化 (X Composite 拡張が必要)"
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr "Composite 拡張が読み込まれていません"
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr "Composite 拡張が有効ではありません"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr "<span font_desc='%s'>Audacious OSD</span>"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 設定"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "テスト"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "アニメーション"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "装飾"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "トリガー"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 msgid "Misc"
 msgstr "その他"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD について"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1803,7 +1805,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1842,25 +1844,25 @@
 msgstr "aRts ドライバ設定"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "バッファリング:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "バッファのサイズ (ミリ秒):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "バッファリング"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "オーディオ圧縮 "
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1876,11 +1878,11 @@
 "ボリュームを一定のレベルに透過的に上げ下げする\n"
 "シンプルなダイナミックレンジコンプレッサ"
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "AudioCompress について"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
@@ -1890,15 +1892,15 @@
 "ば, 必要に応じて音量が下げられます(ただし若干のクリッピングがそれでも発生しま"
 "す)."
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr "オーディオの増幅に用いられる最大値"
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr "音量を徐々に上げていく際のなめらかさ"
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
@@ -1906,91 +1908,95 @@
 "音量を徐々に上げていく際のターゲットのオーディオレベル. 値を低くすると, ピー"
 "クへの範囲がより動的になるが, 全体的に音が静かになります."
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr "保存用のウィンドウの長さ"
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 msgid "AudioCompress preferences"
 msgstr "オーディオ圧縮 設定"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr " 音質オプション "
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr " 積極的にクリッピングを予防する"
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr " ターゲットとゲイン"
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr "ターゲットのオーディオレベル:"
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 msgid "Maximum gain:"
 msgstr "最大ゲイン:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr "ゲインのなめらかさ:"
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr " 履歴 "
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr "保存する履歴の長さ. 高い数値は音量の変更の応答性を低くします."
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr "デフォルト値を読み込む"
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 msgid "Audio values"
 msgstr "オーディオ設定"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "適用"
 
-#: src/blur_scope/blur_scope.c:57
+#: src/blur_scope/blur_scope.c:54
 msgid "/Toggle Decorations"
 msgstr "/装飾の切り替え"
 
-#: src/blur_scope/blur_scope.c:59
+#: src/blur_scope/blur_scope.c:56
 msgid "/-"
 msgstr "/-"
 
-#: src/blur_scope/blur_scope.c:60
+#: src/blur_scope/blur_scope.c:57
 msgid "/Close"
 msgstr "/閉じる"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "ブラースコープ"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "ブラースコープ: 色の選択"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr "CD を追加"
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+msgid "About CD Audio Plugin NG"
+msgstr "CD オーディオプラグイン NG について"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -2012,11 +2018,7 @@
 "\n"
 "これは Google Summer of Code 2007 のプロジェクトでした."
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-msgid "About CD Audio Plugin NG"
-msgstr "CD オーディオプラグイン NG について"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
@@ -2026,93 +2028,94 @@
 "\n"
 "CD が挿入されていないか, オーディオ CD ではありません.\n"
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 msgid "CD Audio Plugin Configuration"
 msgstr "CD オーディオプラグインの設定"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "ディジタルオーディオ抽出"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 msgid "Title information"
 msgstr "タイトル情報"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr "読み込み速度の制限値: "
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr "有効ならば cd-text を使う"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr "有効ならば CDDB を使う"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 msgid "Server: "
 msgstr "サーバ: "
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 msgid "Port: "
 msgstr "ポート番号: "
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr "デフォルトデバイスを上書きする: "
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr "デバグ情報を出力する"
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "コンソールミュージックデコーダ"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "ベース:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "秒"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "トリバル:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "デフォルトの曲の長さ:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "リサンプリング"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "オーディオリサンプリングを有効にする"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "リサンプリングレート:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "SPC タグからの長さを無視する"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr "リバーブを増やす"
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
@@ -2120,11 +2123,11 @@
 "秒数で表現されるデフォルトの曲の長さは, 長さ情報を提供しない曲 (例えばループ"
 "するトラック) に用いられます."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "コンソールミュージックデコーダについて"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2138,7 +2141,7 @@
 "Audacious の実装は William Pitcock <nenolod@nenolod.net> と\n"
 "Shay Green <hotpop.com@blargg> によります."
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2150,27 +2153,27 @@
 "\n"
 "サラウンドエコーは 1999 年 Carl van Schaik による"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "エコー プラグインについて"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "エコー設定"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "遅延: (ミリ秒)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "フィードバック: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "サラウンドエコー"
 
@@ -2238,7 +2241,7 @@
 msgid "Server"
 msgstr "サーバ"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "事前にバッファリングする割合 (%):"
@@ -2446,8 +2449,7 @@
 "デバイスが検出されていないため, バインディングウィンドウが開けません.\n"
 "デバイスが正しく接続されていることを確認してください."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "エラー"
 
@@ -2587,11 +2589,11 @@
 "Giacomo Lozito によって書かれた.\n"
 "\n"
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 msgid "About FileWriter-Plugin"
 msgstr "ファイルライタ・プラグインについて"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2627,59 +2629,51 @@
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
 "USA. まで請求して下さい."
 
-#: src/filewriter/filewriter.c:199
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"リアルタイムモードで実行しているとき\n"
-"ファイルライタ プラグインは利用できません."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 msgid "File Writer Configuration"
 msgstr "ファイルライタの設定"
 
+#: src/filewriter/filewriter.c:488
+msgid "Output file format:"
+msgstr "出力ファイルフォーマット:"
+
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
+msgid "Configure"
+msgstr "設定"
+
+#: src/filewriter/filewriter.c:521
+msgid "Save into original directory"
+msgstr "元のディレクトリに保存する"
+
 #: src/filewriter/filewriter.c:526
-msgid "Output file format:"
-msgstr "出力ファイルフォーマット:"
-
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
-msgid "Configure"
-msgstr "設定"
-
-#: src/filewriter/filewriter.c:559
-msgid "Save into original directory"
-msgstr "元のディレクトリに保存する"
-
-#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr "指定のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "ファイル出力先ディレクトリ:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr "ディレクトリの選択"
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr "ファイル名の取得元:"
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr "元のファイルのタグ"
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "ファイル名から拡張子を取り除かない"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
@@ -2687,7 +2681,7 @@
 "これを有効にすると, 新しいファイル拡張子を末尾につけるより先に, 元のファイル"
 "名の拡張子は取り除かれません."
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr "ファイル名の先頭にトラック番号を付加する"
 
@@ -2763,8 +2757,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr "すべてのフレームに 16 ビットチェックサムを付加する"
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr "品質"
 
@@ -2870,19 +2864,19 @@
 msgid "Tags"
 msgstr "タグ"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis エンコーダ設定"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr "品質レベル (0 - 10):"
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 msgid "FLAC Audio Plugin "
 msgstr "FLAC オーディオ プラグイン"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2898,31 +2892,165 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 msgid "About FLAC Audio Plugin"
-msgstr "FLAC オーディオ プラグインについて"
-
-#: src/jack/configure.c:69
+msgstr "FLAC オーディオプラグインについて"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+msgid "About Gnome Shortcut Plugin"
+msgstr "Gnome ショートカットプラグインについて"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+"Gnome ショートカットプラグイン\n"
+"Gnome ショートカットでプレイヤを操作しよう.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+
+#: src/hotkey/plugin.c:607
+msgid "(none)"
+msgstr "(なし)"
+
+#: src/hotkey/plugin.c:752
+msgid "Global Hotkey Plugin Configuration"
+msgstr "グローバルホットキープラグイン設定"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr "テキストフィールド内でキーコンビネーションを押してください."
+
+#: src/hotkey/plugin.c:773
+msgid "<b>Playback:</b>"
+msgstr "<b>演奏:</b>"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr "<i>Audacious の演奏を制御するキーを設定します.</i>"
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr "次のトラック:"
+
+#: src/hotkey/plugin.c:798
+msgid "Play/Pause:"
+msgstr "演奏/一時停止:"
+
+#: src/hotkey/plugin.c:801
+msgid "Pause:"
+msgstr "一時停止:"
+
+#: src/hotkey/plugin.c:804
+msgid "Stop:"
+msgstr "演奏停止:"
+
+#: src/hotkey/plugin.c:807
+msgid "Next Track:"
+msgstr "次のトラック:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr "5秒進める:"
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr "5秒戻す:"
+
+#: src/hotkey/plugin.c:818
+msgid "<b>Volume Control:</b>"
+msgstr "<b>音量コントロール:</b>"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr "<i>曲の音量をコントロールするキーを設定します.</i>"
+
+#: src/hotkey/plugin.c:841
+msgid "Mute:"
+msgstr "無音:"
+
+#: src/hotkey/plugin.c:844
+msgid "Volume Up:"
+msgstr "音量を上げる:"
+
+#: src/hotkey/plugin.c:847
+msgid "Volume Down:"
+msgstr "音量を下げる:"
+
+#: src/hotkey/plugin.c:852
+msgid "<b>Player:</b>"
+msgstr "<b>プレイヤ:</b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr "<i>プレイヤをコントロールするキーを設定します.</i>"
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr "指定ファイルへ移動:"
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr "プレイヤウィンドウを切り替える:"
+
+#: src/hotkey/plugin.c:903
+msgid "About Global Hotkey Plugin"
+msgstr "グローバルホットキープラグインについて"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+"グローバルホットキープラグイン\n"
+"グローバルキーコンビネーションかマルチメディアキーでプレイヤをコントロール.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"貢献者:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr "有効なすべての jack ポートに接続する"
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr "出力ポートにのみ接続する"
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr "ポートに接続しない"
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 msgid "jack Plugin configuration"
 msgstr "jack プラグイン設定"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr "接続モード"
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 msgid "Enable debug printing"
 msgstr "デバグ出力を有効にする"
 
@@ -2953,15 +3081,15 @@
 "\n"
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " 閉じる "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK 出力プラグイン 0.17 について"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2979,35 +3107,35 @@
 "develia.org の Giacomo Lozito による\n"
 "Audacious ポート"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr "LADSPA プラグインにユーザコントロールはありません"
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 msgid "Name"
 msgstr "名前"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr "UID"
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr "インストール済プラグイン"
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr "動作中のプラグイン"
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr "追加"
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 msgid "Remove"
 msgstr "削除"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr "LADSPA プラグイン カタログ"
 
@@ -3021,15 +3149,15 @@
 "\n"
 "Scrobbler プラグインデータが正しく設定されているか確認してください."
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "LIRC Audacious プラグインについて"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "LIRC プラグイン"
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "LIRC プラグイン"
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -3053,12 +3181,12 @@
 "LIRC の情報は以下で得られる.\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC サポートを初期化できませんでした\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -3069,12 +3197,12 @@
 "%s: 正しい設定ファイルの作り方を知るには\n"
 "%s: LIRC のドキュメントを読んでください\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: 不明なコマンド \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: LIRC から切断されました\n"
@@ -3127,12 +3255,12 @@
 msgid "Preamp (dB):"
 msgstr "プリアンプ (dB):"
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "リプレイゲイン"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "オリジナルのタイトルを上書きする"
 
@@ -3140,7 +3268,8 @@
 msgid "ID3 format:"
 msgstr "ID3 の書式:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "タイトル"
 
@@ -3168,38 +3297,38 @@
 msgid " ID3 Tag "
 msgstr " ID3 タグ "
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "タイトル:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "アーティスト:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "アルバム名:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr "年:"
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "トラック番号:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "ジャンル:"
 
@@ -3207,7 +3336,7 @@
 msgid "Unknown"
 msgstr "不明"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -3223,7 +3352,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr "可変ビットレート (平均 %d kbps)"
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3268,7 +3397,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr "mp3ゲイン minmax=%4s (max-min=%+6.3fdB)"
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3299,15 +3428,15 @@
 "リプレイゲインサポート:\n"
 "    Samuel Krempp"
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 msgid "About MPEG Audio Plugin"
 msgstr "MPEG オーディオプラグインについて"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid "About Metronom"
 msgstr "Metronom について"
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3321,158 +3450,163 @@
 "例: tact://77 - 毎分 77 拍を演奏\n"
 "    tact://60*3/4 - 60 bpm を 3/4 拍子で演奏"
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレータ: %d bpm"
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレータ: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 msgid "ModPlug Configuration"
 msgstr "ModPlug 設定"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16ビット"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr " 8ビット"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr "モノラル (ダウンミックス)"
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "サンプリングレート"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr "最短 (最速)"
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr "線形 (高速)"
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr "スプライン (良品質)"
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr "8 タップ Fir (非常に高品質)"
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 msgid "11 kHz"
 msgstr "11 kHz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr "最短 (最速)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr "線形 (高速)"
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr "スプライン (良品質)"
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8 タップ Fir (非常に高品質)"
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr "ファイル名を曲名として使う"
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr "高速なプレイリスト情報"
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr "ノイズリダクション"
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD を演奏する"
-
-#: src/modplug/gui/interface.cxx:384
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "サンプリングレート"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
+msgid "Enable"
+msgstr "有効"
+
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
+msgid "Depth"
+msgstr "深さ"
+
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
+msgid "Delay"
+msgstr "遅延"
+
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
 msgid "Reverb"
 msgstr "リバーブ"
 
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
-msgid "Enable"
-msgstr "有効"
-
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
-msgid "Depth"
-msgstr "深さ"
-
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
-msgid "Delay"
-msgstr "遅延"
-
-#: src/modplug/gui/interface.cxx:456
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
+msgid "Amount"
+msgstr "量"
+
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
+msgid "Range"
+msgstr "範囲"
+
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
 msgid "Bass Boost"
 msgstr "ベース増加"
 
-#: src/modplug/gui/interface.cxx:510
-msgid "Amount"
-msgstr "量"
-
-#: src/modplug/gui/interface.cxx:519
-msgid "Range"
-msgstr "範囲"
-
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+"注意: プリアンプの設定が高すぎると\n"
+"クリッピング(うるさいカチカチ音や\n"
+"ブツブツ音)の原因になります!"
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 msgid "Preamp"
 msgstr "プリアンプ"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-"注意: プリアンプの設定が高すぎると\n"
-"クリッピングや歪みの原因になります!"
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr "ループ"
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr "エフェクト"
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr "ファイル名を曲名として使う"
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr "高速なプレイリスト情報"
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr "ノイズリダクション"
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr "Amiga MOD を演奏する"
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr "ループしない"
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr "ループ回数"
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr "回"
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr "永遠にループ"
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr "エフェクト"
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr "ループ"
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 msgid "MOD Info"
 msgstr "MOD 情報"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3496,23 +3630,47 @@
 "パターン:\n"
 "チャンネル:"
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 msgid "Samples"
 msgstr "サンプリングレート"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 msgid "Instruments"
 msgstr "楽器"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/modplug/gui/main.cxx:43
+#: src/modplug/gui/main.cxx:44
 msgid "Modplug Input Plugin for Audacious ver"
 msgstr "Modplug 入力プラグイン for Audacious ver"
 
-#: src/modplug/gui/main.cxx:44
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3528,26 +3686,21 @@
 "更新とメンテナンスは Konstanty Bialkowski による.\n"
 "BMP へのポートは Theofilos Intzoglou による."
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 msgid "About Modplug"
 msgstr "Modplug について"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmap ファイルが見つかりませんでした: %s"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "pixmap ファイルの読み込みエラー: %s"
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr "Musepack デコーダプラグイン 1.2"
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3563,134 +3716,134 @@
 "\n"
 "http://musepack.net にて最新版が取得できます\n"
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr "気にしない"
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 msgid "Musepack Decoder Configuration"
 msgstr "Musepack デコーダ設定"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 msgid "General Settings"
 msgstr "一般的な設定"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr "動的ビットレート表示を有効にする"
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 msgid "ReplayGain Settings"
 msgstr "リプレイゲインの設定"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "クリッピング回避機能を有効にする"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "リプレイゲインを有効にする"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 msgid "ReplayGain Type"
 msgstr "リプレイゲインの種類"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 msgid "Use Track Gain"
 msgstr "トラックゲインを使用する"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 msgid "Use Album Gain"
 msgstr "アルバムゲインを使用する"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr "Musepack タグ"
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 msgid "Track:"
 msgstr "トラック:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "保存"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "タグの削除"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr "Musepack 情報"
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, c-format
 msgid "Streamversion %d"
 msgstr "ストリームヴァージョン %d"
 
-#: src/musepack/libmpc.cxx:595
+#: src/musepack/libmpc.cxx:596
 #, c-format
 msgid "Encoder: %s"
 msgstr "エンコーダ: %s"
 
-#: src/musepack/libmpc.cxx:596
+#: src/musepack/libmpc.cxx:597
 #, c-format
 msgid "Profile: %s"
 msgstr "プロファイル: %s"
 
-#: src/musepack/libmpc.cxx:597
+#: src/musepack/libmpc.cxx:598
 #, c-format
 msgid "Average bitrate: %6.1f kbps"
 msgstr "平均ビットレート: %6.1f kbps"
 
-#: src/musepack/libmpc.cxx:598
+#: src/musepack/libmpc.cxx:599
 #, c-format
 msgid "Samplerate: %d Hz"
 msgstr "サンプリングレート: %d Hz"
 
-#: src/musepack/libmpc.cxx:599
-#, c-format
-msgid "Channels: %d"
-msgstr "チャンネル数: %d"
-
 #: src/musepack/libmpc.cxx:600
 #, c-format
-msgid "Length: %d:\\%.2d"
-msgstr "長さ: %d:\\%.2d"
+msgid "Channels: %d"
+msgstr "チャンネル数: %d"
 
 #: src/musepack/libmpc.cxx:601
 #, c-format
+msgid "Length: %d:\\%.2d"
+msgstr "長さ: %d:\\%.2d"
+
+#: src/musepack/libmpc.cxx:602
+#, c-format
 msgid "File size: %d Bytes"
 msgstr "ファイルサイズ: %d Bytes"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, c-format
 msgid "Track Peak: %5u"
 msgstr "トラックピーク: %5u"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "トラックゲイン: %-+2.2f dB"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, c-format
 msgid "Album Peak: %5u"
 msgstr "アルバムピーク: %5u"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "アルバムゲイン: %-+5.2f dB"
@@ -3765,24 +3918,24 @@
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
 "USA. まで請求して下さい."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "デフォルト (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "OSS ドライバの設定"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "代替デバイスを使用する:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "デバイス"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "ミキサの設定:"
 
@@ -3790,7 +3943,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr "セッション間の VMIX 音量を保存"
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "ミキサ"
 
@@ -3834,15 +3987,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA. へ手紙を書いて下さい."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "音量の調整は PCM ではなくマスタを使用する"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio 出力プラグインについて"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3878,27 +4031,27 @@
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
 "USA. まで請求して下さい."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>サービス</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3910,11 +4063,11 @@
 "Audun Hove <audun@nlc.no> と Pipian <pipian@pipian.com> によってオリジナルは"
 "作成された\n"
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler プラグインについて"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3929,7 +4082,7 @@
 "\n"
 "%s\n"
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 msgid "Scrobbler Error"
 msgstr "Scrobbler エラー"
 
@@ -3941,78 +4094,78 @@
 msgid "Error initializing STIL database!\n"
 msgstr "STIL データベース初期化エラー!\n"
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr "オーディオデータバッファのメモリを割り当てられませんでした!\n"
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr "オーバーサンプリングバッファのメモリを割り当てられませんでした!\n"
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr "SID-tune '%s' (サブチューン #%i)を初期化できませんでした!\n"
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr "XMMS オーディオ出力 (fmt=%x, freq=%i, nchan=%i) を開けませんでした!\n"
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr "オーバーサンプリングレート変換パスに失敗しました.\n"
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID 設定"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 msgid "8-bit"
 msgstr " 8ビット"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 msgid "16-bit"
 msgstr "16ビット"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 msgid "Resolution:"
 msgstr "解像度:"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr "オートパニング"
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "チャンネル数:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 msgid "Samplerate:"
 msgstr "サンプリングレート:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 msgid "Use oversampling"
 msgstr "オーバーサンプリングを使う"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr "ファクター:"
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr "大きなファクターはより CPU パワーを必要とします"
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 msgid "Oversampling:"
 msgstr "オーバーサンプリング:"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr "オーディオ"
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
@@ -4022,11 +4175,11 @@
 "うことを\"強制\"します. そうでなければ, 速度は演奏するファイル自体から決定さ"
 "れます."
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr "速度を強制する"
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
@@ -4034,11 +4187,11 @@
 "PAL は 50Hz のリフレッシュレートを用いるヨーロッパの TV 規格です. ほとんどの "
 "SID-tunes は PAL コンピュータ向けに作られています."
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr "PAL (50 Hz)"
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
@@ -4047,15 +4200,15 @@
 "NTSC は 60Hz のリフレッシュレートを用い, PAL とは他にも異なる特徴を持つ TV 規"
 "格です. 主にアメリカ, 日本や他の国々で用いられています."
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr "NTSC (60 Hz)"
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 msgid "Clock speed:"
 msgstr "クロック速度:"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
@@ -4065,11 +4218,11 @@
 "\"強制\"します. 無効ならば, ファイルが PSIDv2NG タイプなら, 望ましい SID モデ"
 "ルが決定されますが, 利用できなければこの設定が用いられます."
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 msgid "Force model"
 msgstr "モデルを強制する"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -4081,19 +4234,19 @@
 "の SID チップは同じではありません), デジタルサンプルの再生を有効にする \"音量"
 "調整バグ\" があります."
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr "MOS 6581"
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr "MOS 8580"
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 msgid "SID model:"
 msgstr "SID モデル:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
@@ -4101,11 +4254,11 @@
 "高速ですがそれほど正確ではない libSIDPlay 1.x を用います. ですがほとんどの場"
 "合問題ありません."
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr "SIDPlay 1 (フレームベース)"
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
@@ -4113,39 +4266,39 @@
 "より正確なエミュレーションのために強力な CPU を必要とする libSIDPlay 2.x を用"
 "います."
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr "SIDPlay 2 (サイクルベース)"
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr "エミュレーションライブラリの選択"
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr "Real C64 (SIDPlay 2 専用)"
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr "バンクスイッチング"
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr "透過 ROM"
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr "PlaySID 環境"
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 msgid "Memory mode:"
 msgstr "メモリモード:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr "Emu#1"
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
@@ -4155,11 +4308,11 @@
 "クル正確からフレーム正確に似た何かに格下げします. この結果, CPU 使用率は下が"
 "りますが, 正確さは悪くなります."
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr "最適化モード (高速, 不正確)"
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
@@ -4169,11 +4322,11 @@
 "トウェア SID チップシミュレータです. ソフトウェアのみでのエミュレーションで"
 "は, 本物の利用可能な SID におそらく最も近いものです."
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr "reSID エミュレーション"
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -4187,49 +4340,49 @@
 "似点を \"ほぼ 100%\" 達成するために用いられます. より多くの情報は http://www."
 "hardsid.com/ を参照してください."
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr "HardSID"
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr "SIDPlay 2 オプション:"
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 "単純に最近傍のサンプルを用いるだけの, 最速ですが最悪のサンプリング方法です."
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr "高速 (最近傍)"
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 "高い音質を低いサンプリングノイズで生成する, サンプル間の線形補間を用います."
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr "線形補間"
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 msgid "Resampling (FIR)"
 msgstr "リサンプリング (FIR)"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 msgid "reSID sampling options:"
 msgstr "reSID サンプリングオプション:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr "Emu#2"
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4241,59 +4394,59 @@
 "ます. しかし, フィルタエミュレーションが無効だと, フィルタを使っている音色は"
 "まったく本物のようには聞こえません."
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr "フィルタをエミュレートする"
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr "FS"
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr "FM"
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr "FT"
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr "値をリセット"
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr "SIDPlay1"
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 msgid "Export"
 msgstr "エクスポート"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr "使用"
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 msgid "Import"
 msgstr "インポート"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 msgid "Delete"
 msgstr "削除"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 msgid "Filter curve:"
 msgstr "フィルタ曲線:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr "SIDPlay2"
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr "フィルタ"
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
@@ -4301,21 +4454,21 @@
 "有効ならば, 必要に応じて末尾に無音部分を追加し, 音色は少なくとも指定された時"
 "間で演奏されます."
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr "少なくとも指定された時間で演奏"
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 msgid "Playtime:"
 msgstr "演奏時間:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr "最小演奏時間:"
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
@@ -4323,26 +4476,26 @@
 "有効ならば, 音色は指定された持続時間 (最大演奏時間) に到達するまで演奏されま"
 "す."
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr "指定された時間いっぱいまで演奏"
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 "有効ならば, 曲や音色の長さが不明な場合のみ, 最大演奏時間が用いられます."
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr "曲の長さが不明な場合のみ"
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr "最大演奏時間:"
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
@@ -4350,43 +4503,80 @@
 "XSIDPLAY 互換の曲の長さデータベースを使用します. (より多くの情報は Audacious-"
 "SID の文書を参照してください)"
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr "XSIDPLAY 互換データベースを使う"
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 msgid "DB-file:"
 msgstr "DB ファイル:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr "データベースパスとファイル名"
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr "曲の長さデータベースファイルを参照"
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr "曲の長さデータベース:"
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 msgid "Songlength"
 msgstr "曲の長さ"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+"このオプションを有効にすると,SID ファイルのカスタムタプルフォーマット文字列"
+"を指定できます.SID プラグインで指定するタプルタグはすぐ下に記述します."
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+msgid "Override generic Tuplez format string"
+msgstr "オリジナルのタプルフォーマット文字列を上書きする"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr "SID ファイルのタプルフォーマット文字列"
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr "<i>SID 特有</i>のタプルフィールドはここに記載されます.<b>:D</b>"
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+msgid "Song title format:"
+msgstr "曲のタイトルの書式:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+"有効にすると,各ファイルのサブチューンがプレイリストに追加されます."
+"無効にすると,デフォルトのサブチューンのみが追加されます."
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr "サブチューンをプレイリストに追加"
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr "少なくとも指定された時間の持続時間を持ったサブチューンのみ追加します."
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
 msgstr "指定された最小の長さのチューンのみ"
 
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 msgid "Sub-tune handling:"
 msgstr "サブチューンの取り扱い:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
@@ -4396,15 +4586,15 @@
 "Audacious-SID は HVSC SID が演奏された場合 STIL データベースから追加情報の使"
 "用・表示を行います."
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr "STIL データベースを使う"
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 msgid "STIL file:"
 msgstr "STIL ファイル:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
@@ -4412,15 +4602,15 @@
 "STIL データベースファイル (STIL.txt) のパスとファイル名を指定します.通常, "
 "HVSC のドキュメントのサブディレクトリです."
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr "STIL データベースファイルを参照"
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr "HVSC パス:"
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
@@ -4428,102 +4618,110 @@
 "High Voltage SID コレクション (HVSC) のベースディレクトリのパスを指定します. "
 "例: /media/C64Music/"
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr "HVSC パスを参照"
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr "SID Tune 情報リスト (STIL) データベース:"
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr "変更を承認して更新する"
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr "あらゆる変更を取り消す"
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 msgid "Audacious-SID Fileinfo"
 msgstr "Audacious-SID ファイル情報"
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr "曲名:"
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr "作曲者:"
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "著作権:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 msgid "Song Information:"
 msgstr "曲情報:"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr "作者:"
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 msgid "Duration:"
 msgstr "持続時間:"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 msgid "Sub-tune Information:"
 msgstr "サブチューン情報:"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr "HVSC 曲の長さデータベースを選択"
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr "STIL データベースを選択"
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr "HVSC 位置のプレフィックスを選択"
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr "インポートする SIDPlay2 フィルタファイルを選択"
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr "エクスポートする SIDPlay2 フィルタファイルを選択"
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 msgid "Confirm selected action"
 msgstr "選択されたアクションの確認"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 msgid "Yes"
 msgstr "はい"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 msgid "No"
 msgstr "いいえ"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "%s について"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr "sid2FilterPresets 構造体の割り当てに失敗しました!\n"
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr "警告: フィルタ曲線の分点がセットできませんでした!\n"
+
+#: src/sid/xs_fileinfo.c:232
 msgid "General info"
 msgstr "一般情報"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr "チューン #%i:"
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr "チューン #%i"
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr "新しいノードの割り当てに失敗. 致命的エラー.\n"
@@ -4670,6 +4868,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr "[SIDPlay2] currEng->load() に失敗しました.\n"
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr "t_xs_tuneinfo ('%s') のメモリを割り当てられませんでした\n"
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr "sidFilename ('%s') を割り当てられませんでした\n"
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr "t_xs_subtuneinfo ('%s', %i) のメモリを割り当てられませんでした\n"
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr "SubTune ポインタ構造体の realloc に失敗しました.\n"
@@ -4683,63 +4896,63 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr "STILDB '%s' を開けませんでした.\n"
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 msgid "About SndStretch"
 msgstr "SndStretch について"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 msgid "Volume corr."
 msgstr "音量補正"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr "一部重ね合わせ"
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 msgid "Speed"
 msgstr "スピード"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr "ピッチ"
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 msgid "Scale"
 msgstr "スケール"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 設定"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Audacious が新しい曲を開始したときに実行するコマンド"
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "曲の終わりで実行するコマンド."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Audacious がプレイリストの最後に到達したときに実行するコマンド."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "例えばネットワークストリームのタイトルなど, 曲のタイトルが変わったときに実行"
 "するコマンド."
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4767,7 +4980,7 @@
 "%%t: プレイリストの位置 (%%02d)\n"
 "%%p: 現在演奏中か (1 or 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4775,7 +4988,7 @@
 "<span size='small'>シェルに渡されるパラメータはクォートでくくられるべきです."
 "さもないとセキュリティ上の危険があります.</span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr "スペクトラムアナライザ"
 
@@ -4837,7 +5050,7 @@
 msgid "Change playing song"
 msgstr "演奏曲の変更"
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4847,15 +5060,15 @@
 "\n"
 "1999. Johan Levin による"
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "エクストラステレオプラグインについて"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "エクストラステレオの設定"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "エフェクトの強さ:"
 
@@ -4891,31 +5104,31 @@
 msgid "Sun driver configuration"
 msgstr "Sun ドライバの設定"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "TiMidity の設定"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "サンプリング幅"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "TiMidity 設定ファイル"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4925,12 +5138,12 @@
 "http://libtimidity.sourceforge.net\n"
 "Konstantin Korikov による"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "TiMidity プラグイン %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "MIDI ファイルを読み込めません"
 
@@ -4952,52 +5165,52 @@
 "URLに tone://frequency1;frequency2;frequency3;... と追加して使用します\n"
 "例 tone://2000;2005 は 2000Hz トーンと 2005Hz トーンを演奏します"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "トーンジェネレータ: "
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr "ファイルを開けません\n"
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr "サポートしていないファイルフォーマットです\n"
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr "ファイルが壊れています\n"
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr "ファイルから読み込めません\n"
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr "利用可能メモリが不十分です\n"
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 msgid "Output plugin error\n"
 msgstr "出力プラグインエラー\n"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 msgid "Unknown error\n"
 msgstr "不明なエラー\n"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr "TTA デコーダエラー"
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 msgid "TTA input plugin "
 msgstr "TTA 入力プラグイン"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
@@ -5005,639 +5218,639 @@
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 msgid "About True Audio Plugin"
 msgstr "True Audio プラグインについて"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 msgid "ID3 Tag:"
 msgstr " ID3 タグ:"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis オーディオプラグインの設定"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Ogg Vorbis タグ:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "タイトルの書式:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "リプレイゲインの設定:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "リプレイゲインの種類:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "トラックのゲイン/ピークを使用する"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "アルバムのゲイン/ピークを使用する"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "6dB ブースト + ハードリミットを有効にする"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "ブルース"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Classic Rock"
 msgstr "クラシックロック"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Country"
 msgstr "カントリー"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Dance"
 msgstr "ダンス"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Disco"
 msgstr "ディスコ"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Funk"
 msgstr "ファンキー"
 
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "グランジ"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "ヒップホップ"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "ジャズ"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "メタル"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "ニューエイジ"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "オールディーズ"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Other"
+msgstr "その他"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "ポップ"
+
+#: src/vorbis/fileinfo.c:83
+msgid "R&B"
+msgstr "R&B"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Rap"
+msgstr "ラップ"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "レゲェ"
+
 #: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "グランジ"
+msgid "Rock"
+msgstr "ロック"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "ヒップホップ"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "ジャズ"
+msgid "Techno"
+msgstr "テクノ"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "インダストリアル"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "オルタナティヴ"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "メタル"
+msgid "Ska"
+msgstr "スカ"
 
 #: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "ニューエイジ"
+msgid "Death Metal"
+msgstr "デスメタル"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "オールディーズ"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "その他"
+msgid "Pranks"
+msgstr "プランク"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "サウンドトラック"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "ポップ"
+msgid "Euro-Techno"
+msgstr "ユーロテクノ"
 
 #: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ambient"
+msgstr "アンビエント"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "ラップ"
+msgid "Trip-Hop"
+msgstr "トリップホップ"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "レゲェ"
+msgid "Vocal"
+msgstr "ヴォーカル"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "ロック"
+msgid "Jazz+Funk"
+msgstr "ジャズ+ファンク"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "テクノ"
+msgid "Fusion"
+msgstr "フュージョン"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "インダストリアル"
+msgid "Trance"
+msgstr "トランス"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "オルタナティヴ"
+msgid "Classical"
+msgstr "クラシカル"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "スカ"
+msgid "Instrumental"
+msgstr "インストゥルメンタル"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "デスメタル"
+msgid "Acid"
+msgstr "アシッド"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "プランク"
+msgid "House"
+msgstr "ハウス"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "サウンドトラック"
+msgid "Game"
+msgstr "ゲーム"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "ユーロテクノ"
+msgid "Sound Clip"
+msgstr "サウンドクリップ"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "アンビエント"
+msgid "Gospel"
+msgstr "ゴスペル"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "トリップホップ"
+msgid "Noise"
+msgstr "ノイズ"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "ヴォーカル"
+msgid "AlternRock"
+msgstr "オルタナロック"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Jazz+Funk"
-msgstr "ジャズ+ファンク"
+msgid "Bass"
+msgstr "ベース"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Fusion"
-msgstr "フュージョン"
+msgid "Soul"
+msgstr "ソウル"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Trance"
-msgstr "トランス"
+msgid "Punk"
+msgstr "パンク"
 
 #: src/vorbis/fileinfo.c:90
-msgid "Classical"
-msgstr "クラシカル"
+msgid "Space"
+msgstr "スペース"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Instrumental"
-msgstr "インストゥルメンタル"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Acid"
-msgstr "アシッド"
+msgid "Meditative"
+msgstr "教会音楽"
 
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "ハウス"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "ゲーム"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "サウンドクリップ"
+msgid "Instrumental Pop"
+msgstr "インストゥルメンタルポップ"
 
 #: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "ゴスペル"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "ノイズ"
+msgid "Instrumental Rock"
+msgstr "インストゥルメンタルロック"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "オルタナロック"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "ベース"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "ソウル"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "パンク"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "スペース"
-
-#: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "教会音楽"
-
-#: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "インストゥルメンタルポップ"
-
-#: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "インストゥルメンタルロック"
-
-#: src/vorbis/fileinfo.c:95
 msgid "Ethnic"
 msgstr "エスニック"
 
-#: src/vorbis/fileinfo.c:95
+#: src/vorbis/fileinfo.c:92
 msgid "Gothic"
 msgstr "ゴシック"
 
-#: src/vorbis/fileinfo.c:96
+#: src/vorbis/fileinfo.c:93
 msgid "Darkwave"
 msgstr "ダークウェーヴ"
 
-#: src/vorbis/fileinfo.c:96
+#: src/vorbis/fileinfo.c:93
 msgid "Techno-Industrial"
 msgstr "テクノインスツルメント"
 
-#: src/vorbis/fileinfo.c:96
+#: src/vorbis/fileinfo.c:93
 msgid "Electronic"
 msgstr "エレクトロニック"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Pop-Folk"
 msgstr "ポップフォーク"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Eurodance"
 msgstr "ユーロダンス"
 
-#: src/vorbis/fileinfo.c:97
+#: src/vorbis/fileinfo.c:94
 msgid "Dream"
 msgstr "ドリーム"
 
-#: src/vorbis/fileinfo.c:98
+#: src/vorbis/fileinfo.c:95
 msgid "Southern Rock"
 msgstr "サザンロック"
 
-#: src/vorbis/fileinfo.c:98
+#: src/vorbis/fileinfo.c:95
 msgid "Comedy"
 msgstr "コメディ"
 
-#: src/vorbis/fileinfo.c:98
+#: src/vorbis/fileinfo.c:95
 msgid "Cult"
 msgstr "カルト"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Gangsta Rap"
 msgstr "ギャングスタラップ"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "トップ 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "クリスチャンラップ"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "ポップ/ファンキー"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "ジャングル"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "ネイティヴアメリカン"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "キャバレー"
 
+#: src/vorbis/fileinfo.c:98
+msgid "New Wave"
+msgstr "ニューウェーブ"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "サイケデリック"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "レイブ"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "ショーチューン"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "トレイラー"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "ローファイ"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "トリバル"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "アシッドパンク"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "アシッドジャズ"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "ポルカ"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "レトロ"
+
 #: src/vorbis/fileinfo.c:101
-msgid "New Wave"
-msgstr "ニューウェーブ"
+msgid "Musical"
+msgstr "ミュージカル"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "サイケデリック"
+msgid "Rock & Roll"
+msgstr "ロックンロール"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "レイブ"
+msgid "Hard Rock"
+msgstr "ハードロック"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "フォーク"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "ショーチューン"
+msgid "Folk/Rock"
+msgstr "フォーク/ロック"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "トレイラー"
+msgid "National Folk"
+msgstr "ナショナルフォーク"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "ローファイ"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "トリバル"
+msgid "Swing"
+msgstr "スウィング"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "アシッドパンク"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "アシッドジャズ"
+msgid "Fast-Fusion"
+msgstr "ファストフュージョン"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "ポルカ"
+msgid "Bebob"
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "レトロ"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "ミュージカル"
+msgid "Latin"
+msgstr "ラテン"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "リバイバル"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "ロックンロール"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "ハードロック"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "フォーク"
-
-#: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "フォーク/ロック"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "ナショナルフォーク"
-
-#: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "スウィング"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "ファストフュージョン"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "ラテン"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "リバイバル"
-
-#: src/vorbis/fileinfo.c:107
 msgid "Celtic"
 msgstr "セルティック"
 
-#: src/vorbis/fileinfo.c:107
+#: src/vorbis/fileinfo.c:104
 msgid "Bluegrass"
 msgstr "ブルーグラス"
 
-#: src/vorbis/fileinfo.c:107
+#: src/vorbis/fileinfo.c:104
 msgid "Avantgarde"
 msgstr "アバンギャルド"
 
-#: src/vorbis/fileinfo.c:108
+#: src/vorbis/fileinfo.c:105
 msgid "Gothic Rock"
 msgstr "ゴシックロック"
 
-#: src/vorbis/fileinfo.c:108
+#: src/vorbis/fileinfo.c:105
 msgid "Progressive Rock"
 msgstr "プログレッシヴロック"
 
-#: src/vorbis/fileinfo.c:109
+#: src/vorbis/fileinfo.c:106
 msgid "Psychedelic Rock"
 msgstr "サイケデリックロック"
 
-#: src/vorbis/fileinfo.c:109
+#: src/vorbis/fileinfo.c:106
 msgid "Symphonic Rock"
 msgstr "シンフォニックロック"
 
-#: src/vorbis/fileinfo.c:109
+#: src/vorbis/fileinfo.c:106
 msgid "Slow Rock"
 msgstr "スローロック"
 
-#: src/vorbis/fileinfo.c:110
+#: src/vorbis/fileinfo.c:107
 msgid "Big Band"
 msgstr "ビッグバンド"
 
-#: src/vorbis/fileinfo.c:110
+#: src/vorbis/fileinfo.c:107
 msgid "Chorus"
 msgstr "コーラス"
 
-#: src/vorbis/fileinfo.c:110
+#: src/vorbis/fileinfo.c:107
 msgid "Easy Listening"
 msgstr "イージーリスニング"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "アコースティック"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "ユーモア"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "スピーチ"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "シャンソン"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "オペラ"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "チャンバーミュージック"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "ソナタ"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Symphony"
 msgstr "シンフォニー"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Booty Bass"
 msgstr "ブーティベース"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Primus"
 msgstr "プリマス"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Porn Groove"
 msgstr "ポルノグルーヴ"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Satire"
 msgstr "サティア"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Slow Jam"
 msgstr "スロージャム"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Club"
 msgstr "クラブ"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Tango"
 msgstr "タンゴ"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Samba"
 msgstr "サンバ"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Folklore"
 msgstr "フォークロア"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Ballad"
 msgstr "バラード"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Power Ballad"
 msgstr "パワーバラード"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Rhythmic Soul"
 msgstr "リズミックソウル"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "フリースタイル"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "デュエット"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "パンクロック"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "ドラムソロ"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "ア・カペラ"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "ユーロハウス"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "ダンスホール"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "ゴア"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "ドラム&バス"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "クラブハウス"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "ハードコア"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "テラー"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "インディーズ"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "ブリットポップ"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "ニガーパンク"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "ポルスクパンク"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "ビート"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "クリスチャンギャングスタラップ"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "ヘヴィーメタル"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "ブラックメタル"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "クロスオーバー"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "コンテンポラリクリスチャン"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "クリスチャンロック"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "メレンゲ"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "サルサ"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "トラッシュメタル"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "アニメ"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "Jポップ"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "シンセポップ"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5646,126 +5859,126 @@
 "エラー発生:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "エラー!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "タグの修正に失敗しました (open)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "タグの修正に失敗しました (close)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "タグの修正に失敗"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr " Ogg Vorbis タグ "
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "日付:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "詳細:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "場所:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "バージョン:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "ISRC 番号:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "組織:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Ogg Vorbis リプレイゲイン "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "トラックのゲイン:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "トラックのピーク:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "アルバムのゲイン:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "アルバムのピーク:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Ogg Vorbis 情報 "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "ビットレート:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "サンプリングレート:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "演奏時間:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "ファイルサイズ:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "N/A"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d Kビット/秒 (ノーマル)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d バイト"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis オーディオ プラグインについて"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5905,11 +6118,11 @@
 msgid "General Plugin Settings:"
 msgstr "一般的なプラグイン設定:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "sndfile WAV サポートについて"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5951,27 +6164,42 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA  02110-1301  USA へ手紙を書いて下さい."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "sndfile WAV プラグイン"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "%s について"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "ソフトウェア音量コントロールを使う"
+
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "リアルタイムモードで実行しているとき\n"
+#~ "ファイルライタ プラグインは利用できません."
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "Error loading pixmap file: %s"
+#~ msgstr "pixmap ファイルの読み込みエラー: %s"
+
+#~ msgid "Tune #%i"
+#~ msgstr "チューン #%i"
 
 #~ msgid "Subtune Control"
 #~ msgstr "サブチューンコントロール:"
 
-#~ msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-#~ msgstr "t_xs_tuneinfo ('%s') のメモリを割り当てられませんでした\n"
-
-#~ msgid "Could not allocate sidFilename ('%s')\n"
-#~ msgstr "sidFilename ('%s') を割り当てられませんでした\n"
-
-#~ msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-#~ msgstr "t_xs_subtuneinfo ('%s', %i) のメモリを割り当てられませんでした\n"
-
 #~ msgid "6581 (reSID)"
 #~ msgstr "6581 (reSID)"
 
@@ -6030,9 +6258,6 @@
 #~ "%F - ファイルパス\n"
 #~ "%e - ファイル拡張子"
 
-#~ msgid "Song name/title format:"
-#~ msgstr "曲名/タイトルの書式:"
-
 #~ msgid "No sub-tune control."
 #~ msgstr "サブチューンコントロールがありません."
 
@@ -6563,9 +6788,6 @@
 #~ msgid "Convert character set from :"
 #~ msgstr "キャラクタセットを変換する"
 
-#~ msgid "to :"
-#~ msgstr " -> "
-
 #~ msgid "Disable bitrate update during playback (saves cpu usage)"
 #~ msgstr "演奏中のビットレート更新を無効にする (CPU 利用を節約)"
 
@@ -6587,9 +6809,6 @@
 #~ msgid "Noise shaping"
 #~ msgstr "ノイズシェーピング"
 
-#~ msgid "none"
-#~ msgstr "なし"
-
 #~ msgid "low"
 #~ msgstr "低"
 
--- a/po/ro.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/ro.po	Thu Nov 01 15:38:07 2007 +0100
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.4.0\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-08-28 20:44+0200\n"
 "Last-Translator: Daniel Patriche <m4st3rth0r@gmail.com>\n"
 "Language-Team: Romanian <audacious@atheme.org>\n"
@@ -18,11 +18,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr "Este utilizat libfaad2"
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
@@ -33,39 +33,39 @@
 "decoder-ul este ·(C)·Nero·AG,·www.nero.com\n"
 "Copyright·(c)·2005-2006·Echipa de dezvoltare Audacious"
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 msgid "About MP4 AAC player plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "Ok"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "Despre "
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -87,62 +87,65 @@
 "Plugin-ul folosește biblioteca AdPlug,·Copyright·(C)·Simon·Peter·și alții.\n"
 "Versiunea AdPlug pentru care a fost link-editat:·"
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 msgid "AdPlug :: Configuration"
 msgstr "AdPlug·::·Configurare"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Anulează"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "General"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 msgid "Sound quality"
 msgstr "Calitatea sunetului"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Rezoluție"
 
+#: src/adplug/adplug-xmms.cc:308
+msgid "8bit"
+msgstr "8 biți"
+
 #: src/adplug/adplug-xmms.cc:313
-msgid "8bit"
-msgstr "8 biți"
-
-#: src/adplug/adplug-xmms.cc:318
 msgid "16bit"
 msgstr "16 biți"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Canale"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
@@ -151,20 +154,20 @@
 "nevoieAceastă setare nu va adăuga efecte stereo, deoarece OPL2 suportă doar "
 "MonoVa consuma însă mai multe resurse de calcul!"
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr "Frecvența"
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Redare"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr "Detectează sfârșitul melodiei"
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
@@ -174,23 +177,23 @@
 "și va avansa la melodia următoare. Dacă este dezactivat, nu se va ști când s-"
 "a terminat melodia și va fi redată din nou, la infinit. "
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 msgid "Formats"
 msgstr "Formate"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 msgid "Format selection"
 msgstr "Selecția formatelor"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Format"
 msgstr "Format"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr "Extensie"
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
@@ -199,88 +202,88 @@
 "Tipurile de fișiere selectate vor fi recunoscute și redate de acest plugin. "
 "Cele deselectate vor fi ignorate, dar pot fi redate de alte pluginuri."
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Numele Fișierului:"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 msgid "Title: "
 msgstr "Titlu: "
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 msgid "File Type: "
 msgstr "Tipul Fișierului: "
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr "Sub-melodii: "
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 msgid "Instruments: "
 msgstr "Instrumente: "
 
+#: src/adplug/adplug-xmms.cc:566
+msgid "Orders: "
+msgstr "Ordine: "
+
+#: src/adplug/adplug-xmms.cc:567
+msgid "Patterns: "
+msgstr "Șabloane: "
+
 #: src/adplug/adplug-xmms.cc:571
-msgid "Orders: "
-msgstr "Ordine: "
-
-#: src/adplug/adplug-xmms.cc:572
-msgid "Patterns: "
-msgstr "Șabloane: "
-
-#: src/adplug/adplug-xmms.cc:576
 msgid "Song"
 msgstr "Melodia"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 msgid "Instrument name"
 msgstr "Numele Instrumentului"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 msgid "Song message"
 msgstr "Mesajul melodiei"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 msgid "Subsong selection"
 msgstr "Selecția sub-melodiei"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr "Ordine: "
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr "Șablon: "
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr "Linie: "
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 msgid "Speed: "
 msgstr "Viteză: "
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 msgid "Timer: "
 msgstr "Cronometru: "
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 msgid "About Apple Lossless Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
@@ -288,15 +291,15 @@
 "Copyright·(c)·2006·Echipa Audacious\n"
 "Porțiuni·(c)·2005-2006·David·Hammerton·<crazney·-at-·crazney.net>"
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr "Despre plugin-ul·pentru Alarmă"
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr "XMMS·Alarm"
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -316,42 +319,44 @@
 "\n"
 "http://www.snika.uklinux.net/xmms-alarm/"
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Închide"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr "Alarmă"
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr "Acesta este semnalul de deșteptare."
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "Ok"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr "Selectați Playlist-ul"
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr "Ne pare rău"
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr "Avertizare"
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -374,165 +379,165 @@
 "--\n"
 "Adam"
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr "Ok"
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 msgid "Alarm Settings"
 msgstr "Opțiuni ale plugin-ului Alarm"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 msgid "Time"
 msgstr "Timp"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 msgid "hours"
 msgstr "ore"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 msgid "Quiet after:"
 msgstr "Oprește după:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr "Alarmă la (implicit):"
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr "Alegeți zilele în care să pornească alarma"
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr "Ziua"
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr "Marți"
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr "Joi"
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr "Vineri"
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 msgid "Sunday"
 msgstr "Duminică"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 msgid "Monday"
 msgstr "Luni"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr "Zile"
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 msgid "Fading"
 msgstr "Tranziție"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "secunde"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Volum: %d%%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 #, fuzzy
 msgid "Current"
 msgstr "Plugin-ul de ieșire curent"
 
-#: src/alarm/interface.c:1130
+#: src/alarm/interface.c:1128
 msgid "reset to current output volume"
 msgstr "resetează la volumul curent"
 
-#: src/alarm/interface.c:1132
+#: src/alarm/interface.c:1130
 #, fuzzy
 msgid "Start at"
 msgstr "Începe redarea playlist-ului curent"
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr "Comandă adițională"
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Activează modul 'Mărime Dublă'"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 #, fuzzy
 msgid "Playlist (optional)"
 msgstr "Selectați Playlist-ul"
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 msgid "Browse..."
 msgstr "Răsfoiește"
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 #, fuzzy
 msgid "Reminder"
 msgstr "Reminder"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Meniu de Opțiuni"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr "Ce înseamnă opțiunile acestea?"
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -638,15 +643,15 @@
 "    oprește. Editați mesajul și activați-l dacă doriți \n"
 "    ca acesta să fie afișat.\n"
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr "Mesajul de reamintire pentru ziua de azi este..."
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 msgid "Thankyou"
 msgstr "Mulțumesc"
 
@@ -691,61 +696,57 @@
 "\n"
 "Autor: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Placă de sunet necunoscută"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, fuzzy, c-format
 msgid "Default PCM device (%s)"
 msgstr "Salvează Lista Implicită"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "Configurarea plugin-ului ALSA"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 #, fuzzy
 msgid "Audio device:"
 msgstr "<b>Sistemul Audio</b>"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Mixer:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Folosește controlul de volum în software"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Placă mixer:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Dispozitiv mixer:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 #, fuzzy
 msgid "Device settings"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Placă de sunet:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 #, fuzzy
 msgid "Buffer time (ms):"
 msgstr "Sări la Timp"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 #, fuzzy
 msgid "Period time (ms):"
 msgstr "Sări la Timp"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
@@ -1356,8 +1357,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 #, fuzzy
 msgid "Name:"
 msgstr "Numele Instrumentului"
@@ -1464,56 +1465,56 @@
 msgid "Concave Rectangle"
 msgstr "Dreptunghi concav"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 #, fuzzy
 msgid "None"
 msgstr "Deselectează tot"
 
-#: src/aosd/aosd_trigger.c:73
+#: src/aosd/aosd_trigger.c:74
 #, fuzzy
 msgid "Playback Start"
 msgstr "Începe redarea playlist-ului curent"
 
-#: src/aosd/aosd_trigger.c:74
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 #, fuzzy
 msgid "Title Change"
 msgstr "Formatul titlului:"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Schimbă volumul cu"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 msgid "Triggers OSD when volume is changed."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 #, fuzzy
 msgid "Pause On"
 msgstr "La încărcare"
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 #, fuzzy
 msgid "Pause Off"
 msgstr "Pauză pentru"
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
@@ -1599,132 +1600,133 @@
 msgid "Select Skin File"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Culori"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Ajustarea culorii"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 #, fuzzy
 msgid "Custom Skin"
 msgstr "Skin-ul implicit:"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 #, fuzzy
 msgid "Skin file:"
 msgstr "Tipul Fișierului: "
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 #, fuzzy
 msgid "Enable trigger"
 msgstr "Activează modul 'Mărime Dublă'"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Eveniment"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 #, fuzzy
 msgid "Composite manager detected"
 msgstr "Deschide Managerul de Playlist-uri"
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 msgid "Transparency"
 msgstr "Transparenţă"
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr "Transparenţă falsă"
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparenţă reală (necesita Extensia X Composite)"
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr "Extensia composită nu a fost încărcată"
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr "Extensia composită nu este disponibilă"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 #, fuzzy
 msgid "Audacious OSD - configuration"
 msgstr "Developerii Audacious:"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Poziţie"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Animaţie"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Decoraţii"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "Declanşator"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 #, fuzzy
 msgid "Audacious OSD - about"
 msgstr "Despre plugin-ul·pentru Alarmă"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1753,26 +1755,26 @@
 msgstr ""
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr ""
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 #, fuzzy
 msgid "Buffer size (ms):"
 msgstr "<span size=\"small\">Titlu</span>"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1782,127 +1784,132 @@
 "keeping the volume level more or less consistent"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 #, fuzzy
 msgid "About AudioCompress"
 msgstr "Despre Audacious"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "Preferințe Audacious"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 #, fuzzy
 msgid " Quality Options "
 msgstr "Meniu de Opțiuni"
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 #, fuzzy
 msgid "Target audio level:"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 msgid "Maximum gain:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr " Istorie "
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 #, fuzzy
 msgid "Load default values"
 msgstr "Încarcă presetarea implicită a egalizatorului"
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "<b>Sistemul Audio</b>"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:57
+#: src/blur_scope/blur_scope.c:54
 #, fuzzy
 msgid "/Toggle Decorations"
 msgstr "Schimbă Coada"
 
-#: src/blur_scope/blur_scope.c:59
+#: src/blur_scope/blur_scope.c:56
 msgid "/-"
 msgstr "/-"
 
-#: src/blur_scope/blur_scope.c:60
+#: src/blur_scope/blur_scope.c:57
 #, fuzzy
 msgid "/Close"
 msgstr "Închide"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 #, fuzzy
 msgid "Blur scope"
 msgstr "Scop din Puncte"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr ""
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 #, fuzzy
 msgid "Options:"
 msgstr "Meniu de Opțiuni"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 #, fuzzy
 msgid "Add CD"
 msgstr "Adauga CD..."
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "Despre plugin-ul·Apple·Lossless·Audio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1915,12 +1922,7 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "Despre plugin-ul·Apple·Lossless·Audio"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 #, fuzzy
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
@@ -1931,114 +1933,115 @@
 "\n"
 "Nici un CD inserat, sau CD-ul inserat nu este audio.\n"
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 #, fuzzy
 msgid "Digital audio extraction"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Informații despre Track"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr "Limitează viteza de citire la:"
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 #, fuzzy
 msgid "Use cd-text if available"
 msgstr "Folosește fonturi Bitmap dacă sunt disponibile"
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 #, fuzzy
 msgid "Use CDDB if available"
 msgstr "Folosește fonturi Bitmap dacă sunt disponibile"
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 msgid "Server: "
 msgstr "Server:"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Port-ul:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 #, fuzzy
 msgid "Override default device: "
 msgstr "Salvează Lista Implicită"
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 #, fuzzy
 msgid "Print debug information"
 msgstr "Informații despre Pluginul de ieșire"
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Inalte:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 #, fuzzy
 msgid "Default song length:"
 msgstr "Pauză"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 #, fuzzy
 msgid "Enable audio resampling"
 msgstr "Activează proxy"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 #, fuzzy
 msgid "Resampling rate:"
 msgstr "Rata de Reîmprospătare"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
+#: src/console/Audacious_Config.cxx:237
+msgid "Ignore length from SPC tags"
+msgstr ""
+
 #: src/console/Audacious_Config.cxx:238
-msgid "Ignore length from SPC tags"
-msgstr ""
-
-#: src/console/Audacious_Config.cxx:239
 msgid "Increase reverb"
 msgstr "Măreşte reverbul"
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr ""
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2046,7 +2049,7 @@
 "        Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2054,29 +2057,29 @@
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 #, fuzzy
 msgid "About Echo Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Configurează Ecou"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 #, fuzzy
 msgid "Volume: (%)"
 msgstr "Volum: %d%%"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr ""
 
@@ -2131,7 +2134,7 @@
 msgid "Server"
 msgstr "Server"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr ""
@@ -2326,8 +2329,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 #, fuzzy
 msgid "Error"
 msgstr "Eroare în Audacious"
@@ -2455,12 +2457,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2480,69 +2482,63 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:199
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 msgid "Configure"
 msgstr "Configurează"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr "Salvează în directorul original"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr "Salvează în directorul specificat"
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 #, fuzzy
 msgid "Output file folder:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr "Alegeţi un director"
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 #, fuzzy
 msgid "Get filename from:"
 msgstr "După calea completă"
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 #, fuzzy
 msgid "original file tags"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 #, fuzzy
 msgid "original filename"
 msgstr "După Fișier"
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2622,8 +2618,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 #, fuzzy
 msgid "Quality"
 msgstr "Calitatea sunetului"
@@ -2731,20 +2727,20 @@
 msgid "Tags"
 msgstr "Tag-uri"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuraţia Vorbis Encoder"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr "Nivelul de calitate (0 - 10):"
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2754,34 +2750,165 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "Despre plugin-ul decodor MP4·AAC"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "Deselectează tot"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Lista plugin-urilor _Generale"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Redare"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Pauză pentru"
+
+#: src/hotkey/plugin.c:801
+#, fuzzy
+msgid "Pause:"
+msgstr "La încărcare"
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "Synthpop"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Informații despre Track"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Schimbă volumul cu"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Data:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Volum: %d%%"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Schimbă volumul cu"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "Numele Instrumentului"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "Despre plugin-ul decodor MP4·AAC"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr "Conectează la toate porturile jack"
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr "Conectează numai la porturile de ieşire"
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 #, fuzzy
 msgid "Connection mode:"
 msgstr "Mod de Vizualizare"
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Activează proxy"
@@ -2805,16 +2932,16 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 #, fuzzy
 msgid " Close "
 msgstr "Închide"
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2825,40 +2952,40 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Numele Instrumentului"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 #, fuzzy
 msgid "Installed plugins"
 msgstr "Reîncarcă Plugin-urile"
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 #, fuzzy
 msgid "Running plugins"
 msgstr "Reîncarcă Plugin-urile"
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 #, fuzzy
 msgid "Add"
 msgstr "Adaugă Fișiere"
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Șterge Duplicatele"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 #, fuzzy
 msgid "LADSPA Plugin Catalog"
 msgstr "Lista plugin-urilor _Generale"
@@ -2870,17 +2997,17 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 #, fuzzy
 msgid "About LIRC Audacious Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/lirc/about.c:92
+#: src/lirc/about.c:90
 #, fuzzy
 msgid "LIRC Plugin "
 msgstr "Plugin de intrare: %s"
 
-#: src/lirc/about.c:94
+#: src/lirc/about.c:92
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2894,12 +3021,12 @@
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 msgstr ""
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2907,12 +3034,12 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, fuzzy, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "Încarcă preset din fișier"
@@ -2969,12 +3096,12 @@
 msgid "Preamp (dB):"
 msgstr ""
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr ""
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr ""
 
@@ -2983,7 +3110,8 @@
 msgid "ID3 format:"
 msgstr "Selecția formatelor"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 #, fuzzy
 msgid "Title"
 msgstr "Titlu"
@@ -3016,44 +3144,44 @@
 msgid " ID3 Tag "
 msgstr ""
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 #, fuzzy
 msgid "Title:"
 msgstr "Titlu: "
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 #, fuzzy
 msgid "Artist:"
 msgstr "Artist"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 #, fuzzy
 msgid "Album:"
 msgstr "Album"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 #, fuzzy
 msgid "Comment:"
 msgstr "Comentariu"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 #, fuzzy
 msgid "Year:"
 msgstr "Anul"
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 #, fuzzy
 msgid "Track number:"
 msgstr "Numărul Trackului"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 #, fuzzy
 msgid "Genre:"
 msgstr "Genul"
@@ -3062,7 +3190,7 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, fuzzy, c-format
 msgid "File Info - %s"
@@ -3078,7 +3206,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, fuzzy, c-format
 msgid "%d Hz"
 msgstr "Hz"
@@ -3123,7 +3251,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3141,17 +3269,17 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 #, fuzzy
 msgid "About MPEG Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "Despre Audacious"
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3160,167 +3288,171 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "AdPlug·::·Configurare"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bit"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
+msgid "11 kHz"
+msgstr "11 kHz"
+
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
 #, fuzzy
 msgid "Sampling Rate"
 msgstr "<b>Convertor pentru rata de eșantionare</b>"
 
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:240
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:256
-msgid "11 kHz"
-msgstr "11 kHz"
-
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
+#, fuzzy
+msgid "Enable"
+msgstr "Activează modul 'Mărime Dublă'"
+
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
+#, fuzzy
+msgid "Depth"
+msgstr "Adancimea cautarii"
+
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
+msgid "Delay"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
+msgid "Amount"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
+msgid "Range"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
+#, fuzzy
+msgid "Preamp"
+msgstr "PREAMP"
+
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+#, fuzzy
+msgid "Effects"
+msgstr "<b>Efecte</b>"
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
 msgid "Use Filename as Song Title"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:353
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
 #, fuzzy
 msgid "Fast Playlist Info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/modplug/gui/interface.cxx:368
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
 msgid "Noise Reduction"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:376
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
 #, fuzzy
 msgid "Play Amiga MOD"
 msgstr "- redă fișierele multimedia"
 
-#: src/modplug/gui/interface.cxx:384
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
-#, fuzzy
-msgid "Enable"
-msgstr "Activează modul 'Mărime Dublă'"
-
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
-#, fuzzy
-msgid "Depth"
-msgstr "Adancimea cautarii"
-
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
-msgid "Delay"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:519
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:528
-msgid "Surround"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:600
-#, fuzzy
-msgid "Preamp"
-msgstr "PREAMP"
-
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 #, fuzzy
 msgid "Don't loop"
 msgstr "Nu curăța playlist-ul"
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 #, fuzzy
 msgid "time(s)"
 msgstr "Timp Scurs"
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-#, fuzzy
-msgid "Effects"
-msgstr "<b>Efecte</b>"
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3334,25 +3466,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 msgid "Samples"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Instrumente: "
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 #, fuzzy
 msgid "Message"
 msgstr "Mesajul melodiei"
 
-#: src/modplug/gui/main.cxx:43
+#: src/modplug/gui/main.cxx:44
 msgid "Modplug Input Plugin for Audacious ver"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:44
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3362,28 +3508,23 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "Despre Audacious"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 #, fuzzy
 msgid "Musepack Decoder Plugin 1.2"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3393,147 +3534,147 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 msgid "Musepack Decoder Configuration"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Plugin de intrare: %s"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 #, fuzzy
 msgid "Enable Clipping Prevention"
 msgstr "Activează proxy"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 #, fuzzy
 msgid "Enable ReplayGain"
 msgstr "Activează modul 'Mărime Dublă'"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Tipul Fișierului: "
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "Fereastra cu informații despre Track"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 #, fuzzy
 msgid "Filename:"
 msgstr "Fișier:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Informații despre Track"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Salvează"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 #, fuzzy
 msgid "Remove Tag"
 msgstr "Șterge Duplicatele"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 #, fuzzy
 msgid "Musepack Info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/musepack/libmpc.cxx:594
+#: src/musepack/libmpc.cxx:595
 #, c-format
 msgid "Streamversion %d"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:595
-#, c-format
-msgid "Encoder: %s"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:596
 #, c-format
-msgid "Profile: %s"
+msgid "Encoder: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
+#, c-format
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
+
+#: src/musepack/libmpc.cxx:599
 #, fuzzy, c-format
 msgid "Samplerate: %d Hz"
 msgstr "Rata de eșantionare [Hz]:"
 
-#: src/musepack/libmpc.cxx:599
+#: src/musepack/libmpc.cxx:600
 #, fuzzy, c-format
 msgid "Channels: %d"
 msgstr "Canale"
 
-#: src/musepack/libmpc.cxx:600
-#, fuzzy, c-format
-msgid "Length: %d:\\%.2d"
-msgstr "Mărimea track-ului"
-
 #: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
+msgid "Length: %d:\\%.2d"
+msgstr "Mărimea track-ului"
+
+#: src/musepack/libmpc.cxx:602
+#, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Fereastra cu informații despre Track"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "<span size=\"small\">Album</span>"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr ""
@@ -3591,25 +3732,25 @@
 "USA."
 msgstr ""
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, fuzzy, c-format
 msgid "Default (%s)"
 msgstr "Implicit"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr ""
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 #, fuzzy
 msgid "Use alternate device:"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr ""
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 #, fuzzy
 msgid "Mixer Settings:"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
@@ -3618,7 +3759,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr ""
 
@@ -3647,15 +3788,15 @@
 "USA."
 msgstr ""
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3675,30 +3816,30 @@
 "USA."
 msgstr ""
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr ""
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 #, fuzzy
 msgid "Username:"
 msgstr "Utilizator:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 #, fuzzy
 msgid "Password:"
 msgstr "Parolă:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 #, fuzzy
 msgid "<b>Last.FM</b>"
 msgstr "Radio Last.fm"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3706,12 +3847,12 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 #, fuzzy
 msgid "About Scrobbler Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3721,7 +3862,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Eroare în Audacious"
@@ -3734,132 +3875,132 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Developerii Audacious:"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 msgid "8-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 msgid "16-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rezoluție"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 #, fuzzy
 msgid "Channels:"
 msgstr "Canale"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 msgid "Samplerate:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 msgid "Oversampling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 #, fuzzy
 msgid "Audio"
 msgstr "Audio"
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 #, fuzzy
 msgid "PAL (50 Hz)"
 msgstr "Rata de eșantionare [Hz]:"
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "NTSC (60 Hz)"
 msgstr "Rata de eșantionare [Hz]:"
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3867,91 +4008,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 msgid "SID model:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 #, fuzzy
 msgid "Emulation library selection:"
 msgstr "Șterge selecția anterioară înainte de a căuta"
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mod de Vizualizare"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -3960,49 +4101,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 #, fuzzy
 msgid "SIDPlay 2 options:"
 msgstr "Meniu de Opțiuni"
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 msgid "Resampling (FIR)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "<b>Convertor pentru rata de eșantionare</b>"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4010,292 +4151,334 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 #, fuzzy
 msgid "FM"
 msgstr "Radio Last.fm"
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 msgid "Export"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 #, fuzzy
 msgid "Import"
 msgstr "Importă"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "Implicit"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 msgid "Filter curve:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 msgid "Play at least for specified time"
 msgstr ""
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 msgid "Playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Tipul Fișierului: "
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 #, fuzzy
 msgid "Song length database:"
 msgstr "Pauză"
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+msgid "Override generic Tuplez format string"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Formatul titlului:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Informații despre Pluginul de ieșire"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr "Foloseste baza de date STIL"
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 msgid "STIL file:"
 msgstr "Fisierul STIL:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 #, fuzzy
 msgid "HVSC path:"
 msgstr "Calea fisierului"
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr "Anuleaza toate schimbarile"
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr "Developerii Audacious:"
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 #, fuzzy
 msgid "Songname:"
 msgstr "Autoderularea Numelui Fișierului"
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Informații despre Track"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 #, fuzzy
 msgid "Author:"
 msgstr "Autor: "
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 msgid "Duration:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Informații despre Pluginul de ieșire"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 #, fuzzy
 msgid "Select STIL-database"
 msgstr "Alege fontul playlist-ului"
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 #, fuzzy
 msgid "Confirm selected action"
 msgstr "Selecția formatelor"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 #, fuzzy
 msgid "No"
 msgstr "Deselectează tot"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "Despre %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, fuzzy, c-format
 msgid "Tune #%i: "
 msgstr "Pornește"
 
-#: src/sid/xs_fileinfo.c:259
-#, fuzzy, c-format
-msgid "Tune #%i"
-msgstr "Pornește"
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4440,6 +4623,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr "Nu s-a putut crea directorul (%s): %s\n"
+
+#: src/sid/xs_slsup.c:224
+#, fuzzy, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr "Nu s-a putut crea directorul (%s): %s\n"
+
+#: src/sid/xs_slsup.c:233
+#, fuzzy, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr "Nu s-a putut crea directorul (%s): %s\n"
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4453,65 +4651,65 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "Despre Audacious"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Schimbă volumul cu"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Viteză: "
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 msgid "Scale"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "AdPlug·::·Configurare"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4528,13 +4726,13 @@
 "%%p: Currently playing (1 or 0)"
 msgstr ""
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
 msgstr ""
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 #, fuzzy
 msgid "Spectrum Analyzer"
 msgstr "Modul Analizatorului"
@@ -4598,23 +4796,23 @@
 msgid "Change playing song"
 msgstr "Pauză"
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 #, fuzzy
 msgid "About Extra Stereo Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 #, fuzzy
 msgid "Effect intensity:"
 msgstr "Lista plugin-urilor de _Efecte"
@@ -4650,45 +4848,45 @@
 msgid "Sun driver configuration"
 msgstr ""
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 #, fuzzy
 msgid "TiMidity Configuration"
 msgstr "AdPlug·::·Configurare"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr ""
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 #, fuzzy
 msgid "TiMidity Configuration File"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
 "by Konstantin Korikov"
 msgstr ""
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, fuzzy, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Plugin de intrare: %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 #, fuzzy
 msgid "Couldn't load MIDI file"
 msgstr "Încarcă și redă un fișier"
@@ -4707,841 +4905,841 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 #, fuzzy
 msgid "Can't open file\n"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 #, fuzzy
 msgid "File is corrupted\n"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 #, fuzzy
 msgid "Can't read from file\n"
 msgstr "Încarcă preset din fișier"
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 #, fuzzy
 msgid "Insufficient memory available\n"
 msgstr "Folosește fonturi Bitmap dacă sunt disponibile"
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Plugin-ul de ieșire curent"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Eroare în Audacious"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 #, fuzzy
 msgid "TTA Decoder Error"
 msgstr "Eroare în Audacious"
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 msgid "ID3 Tag:"
 msgstr ""
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr ""
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr ""
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 #, fuzzy
 msgid "Title format:"
 msgstr "Formatul titlului:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 #, fuzzy
 msgid "ReplayGain Settings:"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 #, fuzzy
 msgid "ReplayGain Type:"
 msgstr "Tipul Fișierului: "
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr ""
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr ""
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Classic Rock"
 msgstr "Classic Rock"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Country"
 msgstr "Country"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Dance"
 msgstr "Dance"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Disco"
 msgstr "Disco"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Funk"
 msgstr "Funk"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/vorbis/fileinfo.c:84
+#: src/vorbis/fileinfo.c:81
 msgid "Hip-Hop"
 msgstr "Hip-Hop"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 msgid "Metal"
 msgstr "Metal"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 #, fuzzy
 msgid "New Age"
 msgstr "Playlist Nou"
 
-#: src/vorbis/fileinfo.c:85
+#: src/vorbis/fileinfo.c:82
 msgid "Oldies"
 msgstr "Oldies"
 
-#: src/vorbis/fileinfo.c:86
+#: src/vorbis/fileinfo.c:83
 msgid "Other"
 msgstr "Other"
 
-#: src/vorbis/fileinfo.c:86
+#: src/vorbis/fileinfo.c:83
 msgid "Pop"
 msgstr "Pop"
 
-#: src/vorbis/fileinfo.c:86
+#: src/vorbis/fileinfo.c:83
 msgid "R&B"
 msgstr "R&B"
 
+#: src/vorbis/fileinfo.c:83
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Rock"
+msgstr "Rock"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Techno"
+msgstr "Techno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Pranks"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
+
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vocal"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Techno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Jazz+Funk"
+msgstr "Jazz+Funk"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternative"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Pranks"
+msgid "Fusion"
+msgstr "Fusion"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Trance"
+msgstr "Trance"
+
+#: src/vorbis/fileinfo.c:87
+msgid "Classical"
+msgstr "Classical"
 
 #: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Soundtrack"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambient"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
+msgid "Instrumental"
+msgstr "Instrumental"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Acid"
+msgstr "Acid"
+
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Game"
 
 #: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vocal"
-
-#: src/vorbis/fileinfo.c:90
-msgid "Jazz+Funk"
-msgstr "Jazz+Funk"
-
-#: src/vorbis/fileinfo.c:90
-msgid "Fusion"
-msgstr "Fusion"
-
-#: src/vorbis/fileinfo.c:90
-msgid "Trance"
-msgstr "Trance"
-
-#: src/vorbis/fileinfo.c:90
-msgid "Classical"
-msgstr "Classical"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Instrumental"
-msgstr "Instrumental"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Acid"
-msgstr "Acid"
-
-#: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
-
-#: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Game"
-
-#: src/vorbis/fileinfo.c:92
 #, fuzzy
 msgid "Sound Clip"
 msgstr "Calitatea sunetului"
 
-#: src/vorbis/fileinfo.c:92
+#: src/vorbis/fileinfo.c:89
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/vorbis/fileinfo.c:92
+#: src/vorbis/fileinfo.c:89
 msgid "Noise"
 msgstr "Noise"
 
-#: src/vorbis/fileinfo.c:92
+#: src/vorbis/fileinfo.c:89
 msgid "AlternRock"
 msgstr "AlternRock"
 
-#: src/vorbis/fileinfo.c:93
+#: src/vorbis/fileinfo.c:90
 msgid "Bass"
 msgstr "Bass"
 
-#: src/vorbis/fileinfo.c:93
+#: src/vorbis/fileinfo.c:90
 msgid "Soul"
 msgstr "Soul"
 
-#: src/vorbis/fileinfo.c:93
+#: src/vorbis/fileinfo.c:90
 msgid "Punk"
 msgstr "Punk"
 
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Space"
+
+#: src/vorbis/fileinfo.c:91
+msgid "Meditative"
+msgstr "Meditative"
+
+#: src/vorbis/fileinfo.c:91
+msgid "Instrumental Pop"
+msgstr "Instrumental Pop"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Instrumental Rock"
+msgstr "Instrumental Rock"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Ethnic"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gothic"
+
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Space"
+msgid "Darkwave"
+msgstr "Darkwave"
+
+#: src/vorbis/fileinfo.c:93
+msgid "Techno-Industrial"
+msgstr "Techno-Industrial"
+
+#: src/vorbis/fileinfo.c:93
+msgid "Electronic"
+msgstr "Electronic"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditative"
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Instrumental Pop"
+msgid "Eurodance"
+msgstr "Eurodance"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Dream"
+msgstr "Dream"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Instrumental Rock"
+msgid "Southern Rock"
+msgstr "Southern Rock"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Ethnic"
+msgid "Comedy"
+msgstr "Comedy"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gothic"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
+msgid "Cult"
+msgstr "Cult"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Techno-Industrial"
+msgid "Gangsta Rap"
+msgstr "Gangsta Rap"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Electronic"
+msgid "Top 40"
+msgstr "Top 40"
+
+#: src/vorbis/fileinfo.c:96
+msgid "Christian Rap"
+msgstr "Christian Rap"
 
 #: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
+msgid "Pop/Funk"
+msgstr "Pop/Funk"
+
+#: src/vorbis/fileinfo.c:97
+msgid "Jungle"
+msgstr "Jungle"
 
 #: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Dream"
+msgid "Native American"
+msgstr "Native American"
 
 #: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Southern Rock"
+msgid "Cabaret"
+msgstr "Cabaret"
+
+#: src/vorbis/fileinfo.c:98
+msgid "New Wave"
+msgstr "New Wave"
 
 #: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Comedy"
+msgid "Psychedelic"
+msgstr "Psychedelic"
 
 #: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Cult"
+msgid "Rave"
+msgstr "Rave"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Gangsta Rap"
-msgstr "Gangsta Rap"
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Trailer"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Top 40"
-msgstr "Top 40"
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
 
 #: src/vorbis/fileinfo.c:99
-msgid "Christian Rap"
-msgstr "Christian Rap"
+msgid "Tribal"
+msgstr "Tribal"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Pop/Funk"
-msgstr "Pop/Funk"
+msgid "Acid Punk"
+msgstr "Acid Punk"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Jungle"
-msgstr "Jungle"
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
 
 #: src/vorbis/fileinfo.c:100
-msgid "Native American"
-msgstr "Native American"
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Cabaret"
-msgstr "Cabaret"
-
-#: src/vorbis/fileinfo.c:101
-msgid "New Wave"
-msgstr "New Wave"
-
-#: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelic"
+msgid "Musical"
+msgstr "Musical"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Trailer"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Musical"
-
-#: src/vorbis/fileinfo.c:104
 msgid "Rock & Roll"
 msgstr "Rock & Roll"
 
-#: src/vorbis/fileinfo.c:104
+#: src/vorbis/fileinfo.c:101
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/vorbis/fileinfo.c:104
+#: src/vorbis/fileinfo.c:101
 msgid "Folk"
 msgstr "Folk"
 
-#: src/vorbis/fileinfo.c:105
+#: src/vorbis/fileinfo.c:102
 msgid "Folk/Rock"
 msgstr "Folk/Rock"
 
-#: src/vorbis/fileinfo.c:105
+#: src/vorbis/fileinfo.c:102
 msgid "National Folk"
 msgstr "National Folk"
 
-#: src/vorbis/fileinfo.c:105
+#: src/vorbis/fileinfo.c:102
 msgid "Swing"
 msgstr "Swing"
 
-#: src/vorbis/fileinfo.c:106
+#: src/vorbis/fileinfo.c:103
 msgid "Fast-Fusion"
 msgstr "Fast-Fusion"
 
-#: src/vorbis/fileinfo.c:106
+#: src/vorbis/fileinfo.c:103
 msgid "Bebob"
 msgstr "Bebob"
 
-#: src/vorbis/fileinfo.c:106
+#: src/vorbis/fileinfo.c:103
 msgid "Latin"
 msgstr "Latin"
 
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Celtic"
+msgstr "Celtic"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Bluegrass"
+msgstr "Bluegrass"
+
+#: src/vorbis/fileinfo.c:104
+msgid "Avantgarde"
+msgstr "Avantgarde"
+
+#: src/vorbis/fileinfo.c:105
+msgid "Gothic Rock"
+msgstr "Gothic Rock"
+
+#: src/vorbis/fileinfo.c:105
+msgid "Progressive Rock"
+msgstr "Progressive Rock"
+
 #: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Celtic"
+msgid "Psychedelic Rock"
+msgstr "Psychedelic Rock"
+
+#: src/vorbis/fileinfo.c:106
+msgid "Symphonic Rock"
+msgstr "Symphonic Rock"
+
+#: src/vorbis/fileinfo.c:106
+msgid "Slow Rock"
+msgstr "Slow Rock"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chorus"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantgarde"
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Acoustic"
+msgstr "Acoustic"
 
 #: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Gothic Rock"
+msgid "Humour"
+msgstr "Humour"
 
 #: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Progressive Rock"
+msgid "Speech"
+msgstr "Speech"
+
+#: src/vorbis/fileinfo.c:108
+msgid "Chanson"
+msgstr "Chanson"
 
 #: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Psychedelic Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Symphonic Rock"
+msgid "Opera"
+msgstr "Opera"
 
 #: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Slow Rock"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chorus"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Easy Listening"
-msgstr "Easy Listening"
-
-#: src/vorbis/fileinfo.c:111
-msgid "Acoustic"
-msgstr "Acoustic"
-
-#: src/vorbis/fileinfo.c:111
-msgid "Humour"
-msgstr "Humour"
-
-#: src/vorbis/fileinfo.c:111
-msgid "Speech"
-msgstr "Speech"
-
-#: src/vorbis/fileinfo.c:111
-msgid "Chanson"
-msgstr "Chanson"
-
-#: src/vorbis/fileinfo.c:112
-msgid "Opera"
-msgstr "Opera"
-
-#: src/vorbis/fileinfo.c:112
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonata"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Symphony"
 msgstr "Symphony"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Booty Bass"
 msgstr "Booty Bass"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Primus"
 msgstr "Primus"
 
-#: src/vorbis/fileinfo.c:113
+#: src/vorbis/fileinfo.c:110
 msgid "Porn Groove"
 msgstr "Porn Groove"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Satire"
 msgstr "Satire"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Slow Jam"
 msgstr "Slow Jam"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Club"
 msgstr "Club"
 
-#: src/vorbis/fileinfo.c:114
+#: src/vorbis/fileinfo.c:111
 msgid "Tango"
 msgstr "Tango"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Samba"
 msgstr "Samba"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Folklore"
 msgstr "Folklore"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Ballad"
 msgstr "Ballad"
 
-#: src/vorbis/fileinfo.c:115
+#: src/vorbis/fileinfo.c:112
 msgid "Power Ballad"
 msgstr "Power Ballad"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Rhythmic Soul"
 msgstr "Rhythmic Soul"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Duet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Drum Solo"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "A Cappella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terror"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "BritPop"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Christian Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Contemporary Christian"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Christian Rock"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occured:\n"
 "%s"
 msgstr "Eroare în Audacious"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Eroare!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Data:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Descriere:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Locaţie:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 #, fuzzy
 msgid "ISRC number:"
 msgstr "Numărul Trackului"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr ""
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 #, fuzzy
 msgid "Track gain:"
 msgstr "Informații despre Track"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 #, fuzzy
 msgid "Track peak:"
 msgstr "Informații despre Track"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 #, fuzzy
 msgid "Album gain:"
 msgstr "<span size=\"small\">Album</span>"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 #, fuzzy
 msgid "Album peak:"
 msgstr "<span size=\"small\">Album</span>"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 #, fuzzy
 msgid " Ogg Vorbis Info "
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 #, fuzzy
 msgid "Bit rate:"
 msgstr "Rata de Reîmprospătare"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 #, fuzzy
 msgid "Sample rate:"
 msgstr "Rata de Reîmprospătare"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 #, fuzzy
 msgid "Length:"
 msgstr "Mărimea track-ului"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 #, fuzzy
 msgid "File size:"
 msgstr "Mărimea Buffer-ului:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, fuzzy, c-format
 msgid "%d:%.2d"
 msgstr "Salt la: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr ""
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, fuzzy, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 #, fuzzy
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5663,11 +5861,11 @@
 msgid "General Plugin Settings:"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr ""
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5690,19 +5888,30 @@
 "Boston, MA  02110-1301  USA"
 msgstr ""
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 #, fuzzy
 msgid "sndfile WAV plugin"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "Despre %s"
-
-#, fuzzy
-#~ msgid "Could not allocate sidFilename ('%s')\n"
-#~ msgstr "Nu s-a putut crea directorul (%s): %s\n"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Folosește controlul de volum în software"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#, fuzzy
+#~ msgid "Tune #%i"
+#~ msgstr "Pornește"
 
 #, fuzzy
 #~ msgid "Load"
--- a/po/ru.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/ru.po	Thu Nov 01 15:38:07 2007 +0100
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.3\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-04-12 21:50+0300\n"
 "Last-Translator: Alexander Orlov <alxorlov@pochta.ru>\n"
 "Language-Team: none\n"
@@ -18,51 +18,51 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "О модуле Flac"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "ОК"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "О "
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -84,223 +84,226 @@
 "Этот модуль использует библиотеку AdPlug, Copyright (C) Simon Peter.\n"
 "Версия библиотеки AdPlug: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "AMIDI-Plug - настройка"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Основной"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Музыкальный клип"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 бит"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 бит"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Каналы"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Моно"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 #, fuzzy
 msgid "Formats"
 msgstr "Формат:"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 #, fuzzy
 msgid "Format selection"
 msgstr "Выбор внутреннего модуля"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 #, fuzzy
 msgid "Format"
 msgstr "Формат:"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Название:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Размер файла:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Инструментальный"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Свинг"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Инструментальный"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Смена песни %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 #, fuzzy
 msgid "Subsong selection"
 msgstr "Выбор внутреннего модуля"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Речь"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Time Div:"
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Гц"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "О модуле поддержки Ogg Vorbis"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -312,42 +315,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "ОК"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -360,171 +365,171 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Настройки микшера:"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Название"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Хор"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Битрэйт:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Звуковая дорожка"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Моно"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 #, fuzzy
 msgid "Fading"
 msgstr "Усиления:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "секунд"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Громкость: (%)"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%d"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 #, fuzzy
 msgid "Final"
 msgstr "Имя файла"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Основной"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 #, fuzzy
 msgid "Browse..."
 msgstr "Просмотреть"
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 #, fuzzy
 msgid "Reminder"
 msgstr "Стиль отображения"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "Определенная пользователем"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Параметры:"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -579,15 +584,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Танго"
@@ -636,57 +641,53 @@
 "USA.\n"
 "Автор: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Неизвестная звуковая карта"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Устройство PCM по-умолчанию (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "Настройка драйвера ALSA"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Аудиоустройство:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Микшер:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Использовать программный регулятор громкости"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Карта микшера:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Устройство микшера:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Настройки устройства"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Звуковая карта:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Размер буфера (мс):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "Размер периода (мс):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Дополнительные настройки"
 
@@ -1396,8 +1397,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">определение</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1498,23 +1499,23 @@
 msgid "Concave Rectangle"
 msgstr "Вогнутый прямоугольник"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Нет"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "Начало воспроизведения"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Начало воспроизведения"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Показывает OSD, когда начинается проигрывание."
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "Изменение названия"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 #, fuzzy
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
@@ -1525,30 +1526,30 @@
 "файла остается тем же. Это полезно, для показа изменений названий у потоков "
 "из Интернет."
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Изменение названия"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 #, fuzzy
 msgid "Triggers OSD when volume is changed."
 msgstr "Показывает OSD, когда начинается проигрывание."
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Pause On"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 #, fuzzy
 msgid "Triggers OSD when playback is paused."
 msgstr "Показывает OSD, когда начинается проигрывание."
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Pause Off"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 #, fuzzy
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показывает OSD, когда начинается проигрывание."
@@ -1628,122 +1629,123 @@
 msgid "Select Skin File"
 msgstr "Выберите файл темы"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "Стиль отображения"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "Особая тема"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr "Файл темы:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "Просмотреть"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Включить событие"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Событие"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 #, fuzzy
 msgid "Transparency"
 msgstr "Транспонирование: "
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Настройка Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Проверка"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Положение"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "События"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Диско"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "О модуле Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1751,7 +1753,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 #, fuzzy
 msgid ""
 "\n"
@@ -1790,25 +1792,25 @@
 msgstr "Настройка драйвера aRts"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Буферизация:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Размер буфера (мс):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Буферизация"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1824,119 +1826,124 @@
 "Простой динамический компрессор, служащий для\n"
 "удержания громкости на более-менее стандартном уровне"
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "О модуле AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "AudioCompress "
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Усиление альбома:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Аудиоустройство:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Применить"
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Переключить отображение обрамления"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr "/Переключить отображение обрамления"
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr "/-"
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr "/Закрыть"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Размытый осциллоскоп"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Размытый осциллоскоп: выбор цвета"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Параметры:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "О модуле LIRC"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1949,109 +1956,105 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "О модуле LIRC"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Настройка модуля поддержки MPEG"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Цифровое считывание аудио"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Формат названия:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Сервер"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Порт:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Модуль поддержки Console Music"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Бас:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "секунд"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Высокие:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Длительность песни по-умолчанию:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Преобразование частоты"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Включить преобразование"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Преобразование частоты:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "Игнорировать длительность из тэгов SPC"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -2062,11 +2065,11 @@
 "записей, у которых отсутствуют данные о длительности (например, бесконечные "
 "дорожки)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "О модуле поддержки Console Music"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2079,7 +2082,7 @@
 "Портирование под Audacious: William Pitcock <nenolod@nenolod.net>, \n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2091,27 +2094,27 @@
 "\n"
 "Объёмное эхо добавлено Carl van Schaik 1999"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "О модуле Эхо"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Настроить Эхо"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Задержка: (мс)"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Обратная связь: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Громкость: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Объёмное эхо"
 
@@ -2181,7 +2184,7 @@
 msgid "Server"
 msgstr "Сервер"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Пребуферизация (%):"
@@ -2388,8 +2391,7 @@
 "Невозможно открыть окно для неопознанного устройства.\n"
 "Убедитесь, что устройство правильно подключено."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Ошибка"
 
@@ -2533,12 +2535,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "О модуле Flac"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2577,69 +2579,60 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"Использование модуля записи на диск невозможно\n"
-"во время работы в режиме реального времени."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Настройка записи на диск"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Каталог для выходных файлов:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Настроить Эхо"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Каталог для выходных файлов:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Не удалять расширение имени файла"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2722,8 +2715,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2829,21 +2822,21 @@
 msgid "Tags"
 msgstr "Тэг:"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Настройка записи на диск"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "Модуль поддержки FLAC"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2853,33 +2846,164 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "Модуль поддержки FLAC"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "О модуле вывода звука ESounD"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "нет"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Настройка модуля вывода звука ESD"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Воспроизведение"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Воспроизведение->Приостановить"
+
+#: src/hotkey/plugin.c:801
+#, fuzzy
+msgid "Pause:"
+msgstr "значение:"
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "в :"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Усиление дорожки:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Устройство управления громкостью:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Дата:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Громкость: (%)"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Громкость->Вниз_5"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>Название: </b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "О модуле Scrobbler"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Настройка модуля вывода звука ESD"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Включить преобразование"
@@ -2903,15 +3027,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " Закрыть "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "О модуле вывода JACK 0.17"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2929,37 +3053,37 @@
 "Портирование для Audacious:\n"
 "Giacomo Lozito из develia.org"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Имя:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Удалить тэг"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2970,15 +3094,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "О модуле LIRC"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Модуль LIRC "
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "Модуль LIRC "
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -3002,12 +3126,12 @@
 "Информацию о LIRC вы можете посмотреть на:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: невозможно инициализировать поддержку LIRC\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -3018,12 +3142,12 @@
 "%s: пожалуйста, прочитайте в документации LIRC\n"
 "%s: как создать рабочий конфигурационый файл\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: неизвестная команда \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: отключение от LIRC\n"
@@ -3076,12 +3200,12 @@
 msgid "Preamp (dB):"
 msgstr "Предусиление (дБ):"
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "ReplayGain"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Не использовать стандартные названия"
 
@@ -3089,7 +3213,8 @@
 msgid "ID3 format:"
 msgstr "Формат ID3-тега:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Название"
 
@@ -3120,38 +3245,38 @@
 msgid " ID3 Tag "
 msgstr " ID3-тег "
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Название:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Исполнитель:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Альбом:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Номер дорожки:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Стиль:"
 
@@ -3160,7 +3285,7 @@
 msgid "Unknown"
 msgstr "(неизвестно)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -3176,7 +3301,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
@@ -3221,7 +3346,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3239,17 +3364,17 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 #, fuzzy
 msgid "About MPEG Audio Plugin"
 msgstr "Модуль поддержки MPEG"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "О "
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3258,169 +3383,173 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор сигналов: "
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Настройка Flac"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 бит"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 бит"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Частота"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Гц"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Гц"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "11000 Гц"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "реверберация"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Частота"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
 #, fuzzy
 msgid "Enable"
 msgstr "Включить событие"
 
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
 #, fuzzy
 msgid "Depth"
 msgstr "Дуэт"
 
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
 #, fuzzy
 msgid "Delay"
 msgstr "Задержка: (мс)"
 
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "реверберация"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
 #, fuzzy
 msgid "Amount"
 msgstr "О "
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
 #, fuzzy
 msgid "Range"
 msgstr "Прямоугольник"
 
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 #, fuzzy
 msgid "Surround"
 msgstr "Объёмное эхо"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 #, fuzzy
 msgid "Preamp"
 msgstr "Предусиление:"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "Информация CD"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3434,25 +3563,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 #, fuzzy
 msgid "Samples"
 msgstr "Салса"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Инструментальный"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3462,27 +3605,22 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "О модуле Эхо"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Невозможно загрузить MIDI файл"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3492,144 +3630,144 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Настройка записи на диск"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Настройки микшера:"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Модуль LIRC"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Настройки ReplayGain:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Включить предотвращение срезания"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "Включить ReplayGain"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Тип ReplayGain:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "использовать Gain/Peak Дорожки"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "использовать Gain/Peak Альбома"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Усиление дорожки:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "Удалить тэг"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
-#, c-format
-msgid "Streamversion %d"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:595
 #, c-format
-msgid "Encoder: %s"
+msgid "Streamversion %d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:596
 #, c-format
-msgid "Profile: %s"
+msgid "Encoder: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
 #, c-format
-msgid "Samplerate: %d Hz"
-msgstr "Частота: %d Гц"
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
 
 #: src/musepack/libmpc.cxx:599
 #, c-format
+msgid "Samplerate: %d Hz"
+msgstr "Частота: %d Гц"
+
+#: src/musepack/libmpc.cxx:600
+#, c-format
 msgid "Channels: %d"
 msgstr "Каналы: %d"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "Сэмплов: %llu\n"
 "Длительность: %d:%.2d"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Размер файла: %ld Байт"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Пик дорожки:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "ReplayGain Усиление дорожки: %+2.2f дБ"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Пик альбома:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "ReplayGain Усиление альбома: %+2.2f дБ"
@@ -3707,24 +3845,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "По умолчанию (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "Настройка драйвера OSS"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Использовать альтернативное устройство:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Устройства"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Настройки микшера:"
 
@@ -3732,7 +3870,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Микшер"
 
@@ -3778,16 +3916,16 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "Громкость регулирует Мастер, а не PCM"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Модуль вывода звука CoreAudio"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3826,27 +3964,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
 "USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Сервис</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3854,11 +3992,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "О модуле Scrobbler"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3868,7 +4006,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Модуль Scrobbler"
@@ -3881,134 +4019,134 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Настройка Audacious OSD"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 бит"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 бит"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 #, fuzzy
 msgid "Resolution:"
 msgstr "Разрешение"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Частота:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Скорость воспроизведения"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 #, fuzzy
 msgid "Force model"
 msgstr "Режим дорожки"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -4016,92 +4154,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Транспонирование: "
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -4110,49 +4248,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Преобразование частоты:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4160,295 +4298,338 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 #, fuzzy
 msgid "Export"
 msgstr "Порт"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 #, fuzzy
 msgid "Import"
 msgstr "Порт"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "По умолчанию"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Размер файла:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Воспроизводить на нормальной скорости"
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Файл устройства:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Длительность песни по-умолчанию:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Не использовать стандартные названия"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Формат названия:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Регулятор громкости:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Файл темы:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD "
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Авторское право:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Информация"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Стиль"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Информация"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 #, fuzzy
 msgid "Confirm selected action"
 msgstr "Выбор внутреннего модуля"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "да"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "О программе %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "Основной"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4591,6 +4772,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4604,66 +4800,66 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "О драйвере OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Регулятор громкости:"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Речь"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Сохранить"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Настройка драйвера Sun"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Команды"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Команда, запускаемая когда Audacious начинает новую песню."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Команда, запускаемая в конце песни."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Команда, запускаемая когда Audacious достигает конца списка."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4692,7 +4888,7 @@
 "%%t: Позиция песни в списке (%%02d)\n"
 "%%p: Играет сейчас (1 или 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4700,7 +4896,7 @@
 "<span size='small'>Параметры, передаваемые оболочке, должны быть заключены в "
 "кавычки. В противном случае возможны проблемы с безопасностью.</span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4763,7 +4959,7 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4773,15 +4969,15 @@
 "\n"
 "Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "О модуле Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Настроить Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Интенсивность эффекта:"
 
@@ -4817,31 +5013,31 @@
 msgid "Sun driver configuration"
 msgstr "Настройка драйвера Sun"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "Настройка модуля TiMidity"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Гц"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Гц"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Гц"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Длительность сэмпла"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "Конфигурационный файл TiMidity"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4851,12 +5047,12 @@
 "http://libtimidity.sourceforge.net\n"
 "Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Модуль TiMidity %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "Невозможно загрузить MIDI файл"
 
@@ -4878,695 +5074,695 @@
 "Для использования добавьте URL: tone://частота1;частота2;частота3;...\n"
 "Например tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Модуль Ноль-вывод "
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Неизвестная звуковая карта"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Модуль Ноль-вывод "
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "О модуле поддержки Ogg Vorbis"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr " ID3-тег "
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Изменение настроек модуля Ogg Vorbis"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Теги Ogg Vorbis:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Формат названия:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "Настройки ReplayGain:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "Тип ReplayGain:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "использовать Gain/Peak Дорожки"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "использовать Gain/Peak Альбома"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "Включить усиление на 6dB + тяжелое ограничение"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Блюз"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Классический рок"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Кантри"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Дэнс"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Диско"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Фанк"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Гранж"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Хип-Хоп"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Джаз"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Метал"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "Нью Эйдж"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Ретро"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Классический рок"
+msgid "Other"
+msgstr "Другое"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Поп"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Кантри"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Дэнс"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Диско"
+msgid "Rap"
+msgstr "Рэп"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Регги"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Фанк"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Гранж"
+msgid "Rock"
+msgstr "Рок"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Хип-Хоп"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Джаз"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Метал"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "Нью Эйдж"
+msgid "Techno"
+msgstr "Техно"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Индустриальный"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Альтернативный"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Ретро"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Другое"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Поп"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ска"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Дэз метал"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Шалость"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Звуковая дорожка"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Рэп"
+msgid "Euro-Techno"
+msgstr "Евро-Техно"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Регги"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Рок"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Техно"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Индустриальный"
+msgid "Ambient"
+msgstr "Окружающая среда"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Трип-Хоп"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Вокал"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Альтернативный"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ска"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Дэз метал"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Шалость"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Звуковая дорожка"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Евро-Техно"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Окружающая среда"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Трип-Хоп"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Вокал"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Джаз+Фанк"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Слияние"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Транс"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Классика"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Инструментальный"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Кислота"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "Хаус"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Игра"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Музыкальный клип"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Евангелие"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Шум"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "Альтернативный рок"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Бас"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Душа"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Панк"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Космос"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "Хаус"
+msgid "Meditative"
+msgstr "Медитация"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Игра"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Музыкальный клип"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Евангелие"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Шум"
+msgid "Instrumental Pop"
+msgstr "Иструментальный поп"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "Альтернативный рок"
+msgid "Instrumental Rock"
+msgstr "Иструментальный рок"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Этнический"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Готический"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Бас"
+msgid "Darkwave"
+msgstr "Темная волна"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Душа"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Панк"
+msgid "Techno-Industrial"
+msgstr "Техноиндустриальный"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Космос"
+msgid "Electronic"
+msgstr "Электронный"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Медитация"
+msgid "Pop-Folk"
+msgstr "Народный поп"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Евродэнс"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Иструментальный поп"
+msgid "Dream"
+msgstr "Сон"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Иструментальный рок"
+msgid "Southern Rock"
+msgstr "Южный рок"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Этнический"
+msgid "Comedy"
+msgstr "Комедия"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Готический"
+msgid "Cult"
+msgstr "Культ"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Темная волна"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Техноиндустриальный"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Электронный"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Народный поп"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Евродэнс"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Сон"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Южный рок"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Комедия"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Культ"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Черный рэп"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Христианский реп"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Поп/Фанк"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Джангл"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Народная американская"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Кабаре"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "Новая волна"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Психоделия"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Рэйв"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Импровизация"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Анонс"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Семейное"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Кислотный панк"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Кислотный джаз"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Полька"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Ретро"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Психоделия"
+msgid "Musical"
+msgstr "Музыкальное"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Рэйв"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Импровизация"
+msgid "Rock & Roll"
+msgstr "Рок-н-рол"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Тяжелый рок"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Фольк"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Анонс"
+msgid "Folk/Rock"
+msgstr "Фольк/Рок"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Национальный фольк"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Семейное"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Кислотный панк"
+msgid "Swing"
+msgstr "Свинг"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Кислотный джаз"
+msgid "Fast-Fusion"
+msgstr "Быстрое слияние"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Полька"
+msgid "Bebob"
+msgstr "Бибоп"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Ретро"
+msgid "Latin"
+msgstr "Латиноамериканская"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Возрождение"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Музыкальное"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Рок-н-рол"
+msgid "Celtic"
+msgstr "Кельтская"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Тяжелый рок"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Фольк"
+msgid "Avantgarde"
+msgstr "Авангард"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Фольк/Рок"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Национальный фольк"
+msgid "Gothic Rock"
+msgstr "Готический рок"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Свинг"
+msgid "Progressive Rock"
+msgstr "Прогрессивный рок"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Быстрое слияние"
+msgid "Psychedelic Rock"
+msgstr "Психоделический рок"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Бибоп"
+msgid "Symphonic Rock"
+msgstr "Симфонический рок"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Латиноамериканская"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Возрождение"
+msgid "Slow Rock"
+msgstr "Медленный рок"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Кельтская"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Хор"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Авангард"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Готический рок"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Прогрессивный рок"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Психоделический рок"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Симфонический рок"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Медленный рок"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Хор"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Акустическая"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Юмор"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Речь"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Шансон"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Опера"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Камерная музыка"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Соната"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Симфония"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Прима"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Порн грув"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Сатира"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Медленный джэм"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Клуб"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Танго"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Симфония"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Прима"
+msgid "Samba"
+msgstr "Самба"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Фольклор"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Баллада"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Сильная баллада"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Порн грув"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Сатира"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Медленный джэм"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Клуб"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Танго"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Самба"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Фольклор"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Баллада"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Сильная баллада"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Ритмичный соул"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Свободный стиль"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Дуэт"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Панк рок"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Ударное соло"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "А Капелла"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Танцевальный зал"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Гоа"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Драм-н-бас"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Клуб-хаус"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Хардкор"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Террор"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "Бритпоп"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Чёрный панк"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Польский панк"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Бит"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Черный христианский рэп"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Тяжелый метал"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Чёрный метал"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Переходный"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Современная христианская"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Христианский рок"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Меренга"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Салса"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Трэш метал"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Аниме"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Электронный поп"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5575,126 +5771,126 @@
 "Произошла ошибка:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Ошибка!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Не удалось изменить тег (открыть)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Не удалось изменить тег (закрыть)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Не удалось изменить тег"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr " Тег Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Дата:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Расположение:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Версия:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "Номер ISRC:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Организация:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Ogg Vorbis ReplayGain "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Усиление дорожки:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Пик дорожки:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Усиление альбома:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Пик альбома:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Информация Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Битрэйт:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Частота:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Длина:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Размер файла:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d КБит/с (номинал)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d байт"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "О модуле поддержки Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5830,11 +6026,11 @@
 msgid "General Plugin Settings:"
 msgstr "Настройки ReplayGain:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "О модуле поддержки WAV"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5878,14 +6074,30 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02111-1307, USA."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "модуль sndfile WAV"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "О программе %s"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Использовать программный регулятор громкости"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "Использование модуля записи на диск невозможно\n"
+#~ "во время работы в режиме реального времени."
 
 #, fuzzy
 #~ msgid "Subtune Control"
@@ -5896,10 +6108,6 @@
 #~ msgstr "Не использовать стандартные названия"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Формат названия:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Регулятор громкости:"
 
@@ -6360,9 +6568,6 @@
 #~ msgid "Convert character set from :"
 #~ msgstr "Преобразовать кодировку из :"
 
-#~ msgid "to :"
-#~ msgstr "в :"
-
 #~ msgid "Disable bitrate update during playback (saves cpu usage)"
 #~ msgstr ""
 #~ "Запретить обновление битрейта во время проигрывания (уменьшает загрузку "
@@ -6386,9 +6591,6 @@
 #~ msgid "Noise shaping"
 #~ msgstr "Подавление шума"
 
-#~ msgid "none"
-#~ msgstr "нет"
-
 #~ msgid "low"
 #~ msgstr "низкое"
 
--- a/po/sk.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/sk.po	Thu Nov 01 15:38:07 2007 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-03-14 02:18+0100\n"
 "Last-Translator: Andrej Herceg <herceg.andrej@zoznam.sk>\n"
 "Language-Team: \n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "O module Flac"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "OK"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "O "
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -81,223 +81,226 @@
 "Modul používa knižnicu AdPlug, copyright (C) Simon Peter a iný.\n"
 "Zostavené s AdPlug knižnicou verzie: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "AMIDI-Plug - nastavenie"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Zvukový klip"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 bitov"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 bitov"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Počet kanálov"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Prehrať"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 #, fuzzy
 msgid "Formats"
 msgstr "Formát:"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 #, fuzzy
 msgid "Format selection"
 msgstr "Výber koncového zariadenia"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 #, fuzzy
 msgid "Format"
 msgstr "Formát:"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Meno súboru"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Názov:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Veľkosť súboru:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Inštrumentálna"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Swing"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Inštrumentálna"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Zmena skladby %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 #, fuzzy
 msgid "Subsong selection"
 msgstr "Výber koncového zariadenia"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Hovorené slovo"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Čas. pomer:"
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "O module Ogg Vorbis Audio"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -309,42 +312,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -357,171 +362,171 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Nastavenia mixéru:"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Názov"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Chorus"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Dátový tok:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Soundtrack"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Mono"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 #, fuzzy
 msgid "Fading"
 msgstr "Rozsvietenie:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Hlasitosť (%):"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%d"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 #, fuzzy
 msgid "Final"
 msgstr "Meno súboru"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Všeobecné"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 #, fuzzy
 msgid "Browse..."
 msgstr "Prechádzať"
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 #, fuzzy
 msgid "Reminder"
 msgstr "Štýl zobrazenia"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "užívateľom definované"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Nastavenia:"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -576,15 +581,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Tango"
@@ -629,57 +634,53 @@
 "675 Mass Ave, Cambridge, MA 02139, USA. Autor: Matthieu Sozeau "
 "(mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Neznáma zvuková karta"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Štandardné PCM zariadenie (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "Nastavenie ovládača ALSA"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Zvukové zariadenie:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Mixér:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Softvérové ovládanie hlasitosti"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Karta s mixérom:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Zariadenie mixéru:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Nastavenia zariadenia"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Zvuková karta:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Veľkosť vyrovnávacej pamäte (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "Perióda (ms):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Pokročilé nastavenia"
 
@@ -1387,8 +1388,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">štd.</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1489,23 +1490,23 @@
 msgid "Concave Rectangle"
 msgstr "Konkávny obdĺžnik"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Žiadne"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "Začiatok prehrávania"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Začiatok prehrávania"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "Zmena názvu"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 #, fuzzy
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
@@ -1516,30 +1517,30 @@
 "nezmenené. Vhodné je to hlavne na zobrazenie zmien názvov pri prehrávaní "
 "internetových prúdov."
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Zmena názvu"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 #, fuzzy
 msgid "Triggers OSD when volume is changed."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Pause On"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 #, fuzzy
 msgid "Triggers OSD when playback is paused."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Pause Off"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 #, fuzzy
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
@@ -1619,122 +1620,123 @@
 msgid "Select Skin File"
 msgstr "Vyberte súbor s motívom"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "Štýl zobrazenia"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "Používateľský motív"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr "Súbor s motívom:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Povoliť spúšťač"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Udalosť"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 #, fuzzy
 msgid "Transparency"
 msgstr "Transponovať: "
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Nastavenia OSD pre Audacious"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Vyskúšať"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Animácia"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "O module OSD pre Audacious"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1742,7 +1744,7 @@
 "\n"
 "OSD pre Audacious"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 #, fuzzy
 msgid ""
 "\n"
@@ -1781,25 +1783,25 @@
 msgstr "Nastavenia ovládača aRts"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Vyrovnávanie:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Veľkosť vyrovnávacej pamäte (ms):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Vyrovnávanie"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioKopresor"
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1815,119 +1817,124 @@
 "Jednoduchý zhusťovač dynamického rozsahu udržujúci\n"
 "hlasitosť na viac-menej rovnakej úrovni"
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "O AudioKompresore"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "AudioKopresor"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Zosilnenie albumu:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Zvukové zariadenie:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Použiť"
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Prepnúť zobrazenie dekorácií"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr "/Prepnúť zobrazenie dekorácií"
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr "/-"
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr "/Zatvoriť"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Blur scope"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Výber farby"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Nastavenia:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "O module LIRC pre Audacious"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1940,109 +1947,105 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "O module LIRC pre Audacious"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "Nastavenie modulu MPEG Audio"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Digitálne"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Formát názvu:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Server"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Port:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Dekodér konzolovej hudby"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Hĺbky:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "sekúnd"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Štandardná dĺžka skladby:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Prevzorkovanie"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Povoliť prevzorkovanie zvuku"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Prevzorkovať na:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovať dĺžku z SPC značiak"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -2052,11 +2055,11 @@
 "Štandardná dĺžka skladby, vyjadrená v sekundách, je použitá pri skladbách, "
 "ktoré neposkytujú informáciu o dĺžke (napr. skladby s opakovaním)."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "O dekodéry konzolovej hudby"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2068,7 +2071,7 @@
 "Pre Audiacious upravili: William Pitcock <nenolod@nenolod.net>,\n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2080,27 +2083,27 @@
 "\n"
 "Priestorové echo napísal Carl van Shaik, 1999"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "O module Ozvena"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Nastaviť ozvenu"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Oneskorenie (ms):"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Spätná väzba (%):"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Hlasitosť (%):"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Priestorová ozvena"
 
@@ -2167,7 +2170,7 @@
 msgid "Server"
 msgstr "Server"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Dopredu načítať (v percentách):"
@@ -2375,8 +2378,7 @@
 "Okno s prepojeniami pre nedetekované zariadenie sa nedá otvoriť.\n"
 "Uistite sa, že zariadenie je správne pripojené."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Chyba"
 
@@ -2520,12 +2522,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "O module Flac"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2561,69 +2563,60 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"Kým ste v režime reálneho času, nemôžete\n"
-"modul Disk Writer použiť."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Nastavenie Disk Writer"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Adresár s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Nastaviť ozvenu"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Adresár s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Neodstraňovať príponu mena súboru"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2706,8 +2699,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2813,21 +2806,21 @@
 msgid "Tags"
 msgstr "Značka"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavenie Disk Writer"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "Modul Flac Audio"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2837,33 +2830,164 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "Modul Flac Audio"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "O module ESounD"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "žiadne"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Nastavenie výstupného modulu ESD"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Prehrať"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Prehrávanie->Pozastaviť"
+
+#: src/hotkey/plugin.c:801
+#, fuzzy
+msgid "Pause:"
+msgstr "hodnota:"
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "na:"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Zosilnenie skladby:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Zariadenie na ovládanie hlasitosti:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Dátum:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Hlasitosť (%):"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Hlasitosť->Znížiť o 5"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>Názov: </b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "O module Scrobbler"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "Nastavenie výstupného modulu ESD"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Povoliť rozptýlenie"
@@ -2887,15 +3011,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " Zatvoriť "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupnom module JACK 0.17"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2913,37 +3037,37 @@
 "Pre Audacious upravil\n"
 "Giacomo Lozito z develia.org"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "Meno:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Odstrániť značku"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2954,15 +3078,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "O module LIRC pre Audacious"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "Modul LIRC"
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "Modul LIRC"
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2986,12 +3110,12 @@
 "Informácie o LIRC môžete získať na:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC podpora sa nedá inicializovať\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -3002,12 +3126,12 @@
 "%s: prečítajte si, prosím, dokumentáciu k LIRC\n"
 "%s: ako správne vytvoriť konfiguračný súbor\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: neznámy príkaz \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: odpojené od LIRC\n"
@@ -3060,12 +3184,12 @@
 msgid "Preamp (dB):"
 msgstr "Predzosilnenie (dB):"
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "Zosilnenie prehrávanie"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Používať vlastný formát názvu"
 
@@ -3073,7 +3197,8 @@
 msgid "ID3 format:"
 msgstr "Formát ID3:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Názov"
 
@@ -3104,38 +3229,38 @@
 msgid " ID3 Tag "
 msgstr " ID3 značka "
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Názov:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Umelec:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Album:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Číslo stopy:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Žáner:"
 
@@ -3144,7 +3269,7 @@
 msgid "Unknown"
 msgstr "(neznáme)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -3160,7 +3285,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3205,7 +3330,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3223,17 +3348,17 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 #, fuzzy
 msgid "About MPEG Audio Plugin"
 msgstr "Modul MPEG Audio"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "O "
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3242,169 +3367,173 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor tónov:"
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Nastavenia Flac"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bitov"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bitov"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Vzorkovacia frekvencia"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Hz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Hz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "10000 Hz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "dozvuk"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Vzorkovacia frekvencia"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
 #, fuzzy
 msgid "Enable"
 msgstr "Povoliť spúšťač"
 
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
 #, fuzzy
 msgid "Depth"
 msgstr "Duet"
 
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
 #, fuzzy
 msgid "Delay"
 msgstr "Oneskorenie (ms):"
 
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "dozvuk"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
 #, fuzzy
 msgid "Amount"
 msgstr "O "
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
 #, fuzzy
 msgid "Range"
 msgstr "Obdĺžnik"
 
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 #, fuzzy
 msgid "Surround"
 msgstr "Priestorová ozvena"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 #, fuzzy
 msgid "Preamp"
 msgstr "Predzosilnenie:"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "Informácia o CD"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3418,25 +3547,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 #, fuzzy
 msgid "Samples"
 msgstr "Salsa"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Inštrumentálna"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3446,27 +3589,22 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "O module Ozvena"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "MIDI súbor sa nepodarilo načítať"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3476,144 +3614,144 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Nastavenie Disk Writer"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Nastavenia mixéru:"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "Modul LIRC"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "Nastavenia zosilnenia prehrávania:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr "Povoliť prevenciu orezania"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "Zapnúť zosilnenie pri prehrávaní"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "Typ zosilnenia:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "použiť zosilnenie podľa vrcholu v skladbe"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "použiť zosilnenie podľa vrcholu na albume"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Zosilnenie skladby:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Uložiť"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "Odstrániť značku"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
-#, c-format
-msgid "Streamversion %d"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:595
 #, c-format
-msgid "Encoder: %s"
+msgid "Streamversion %d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:596
 #, c-format
-msgid "Profile: %s"
+msgid "Encoder: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
 #, c-format
-msgid "Samplerate: %d Hz"
-msgstr "Vzorkovacia frekvencia: %d Hz"
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
 
 #: src/musepack/libmpc.cxx:599
 #, c-format
+msgid "Samplerate: %d Hz"
+msgstr "Vzorkovacia frekvencia: %d Hz"
+
+#: src/musepack/libmpc.cxx:600
+#, c-format
 msgid "Channels: %d"
 msgstr "Počet kanálov: %d"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "Vzorkov: %llu\n"
 "Dĺžka: %d:%.2d"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Veľkosť súboru: %ld B"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Vrchol skladby:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Zosilnenie stopy: %+2.2f dB"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Vrchol albumu:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Zosilnenie albumu: %+2.2f dB"
@@ -3688,24 +3826,24 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Štandardné (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "Nastavenie ovládača OSS"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Použiť iné zariadenie:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Zariadenia"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Nastavenia mixéru:"
 
@@ -3713,7 +3851,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Mixér"
 
@@ -3755,16 +3893,16 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "Hlasitosť je ovládaná kanálom Master a nie PCM"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Základný zvukový výstupný modul"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3800,27 +3938,27 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Služby</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Prístupové meno:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3828,11 +3966,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "O module Scrobbler"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3842,7 +3980,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Modul Scrobbler"
@@ -3855,134 +3993,134 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Nastavenia OSD pre Audacious"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bitov"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bitov"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rozlíšenie"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Počet kanálov:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Vzorkovacia frekvencia:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Rýchlosť prehrávania"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 #, fuzzy
 msgid "Force model"
 msgstr "Režim stopy"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3990,92 +4128,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transponovať: "
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -4084,49 +4222,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Prevzorkovať na:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4134,295 +4272,338 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 #, fuzzy
 msgid "Export"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 #, fuzzy
 msgid "Import"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "Štandardné"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Veľkosť súboru:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Prehrávať normálnou rýchlosťou"
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Meno súboru:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Štandardná dĺžka skladby:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Používať vlastný formát názvu"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Formát názvu:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Ovládanie hlasitosti:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Súbor s motívom:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "OSD pre Audacious"
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Autorské práva:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Výzdoba"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 #, fuzzy
 msgid "Confirm selected action"
 msgstr "Výber koncového zariadenia"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "áno"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 #, fuzzy
 msgid "No"
 msgstr "Žiadne"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "O %s"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "Všeobecné"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4565,6 +4746,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4578,67 +4774,67 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "O module OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Ovládanie hlasitosti:"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Hovorené slovo"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Uložiť"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Nastavenie ovládača pre Sun"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Príkazy"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Príkaz, ktorý sa vykoná keď Audacious začne prehrávať novú skladbu."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Príkaz:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Príkaz, ktorý sa vykoná na konci skladby."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4667,7 +4863,7 @@
 "%%t: pozícia v zozname skladieb (%%02d)\n"
 "%%p: práve sa hrá (1 alebo 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4676,7 +4872,7 @@
 "úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko.</"
 "span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4739,7 +4935,7 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4749,15 +4945,15 @@
 "\n"
 "Napísal Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "O module Extra stereo"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Nastaviť Extra stereo"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Sila efektu:"
 
@@ -4793,31 +4989,31 @@
 msgid "Sun driver configuration"
 msgstr "Nastavenie ovládača pre Sun"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "Nastavenia TiMidity"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "10000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Šírka vzorky"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "Konfiguračný súbor TiMidity"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4827,12 +5023,12 @@
 "http://libtimidity.sourceforge.net\n"
 "napísal Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "Modul TiMidity %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "MIDI súbor sa nepodarilo načítať"
 
@@ -4856,695 +5052,695 @@
 "napr. na prehranie tónov o frekvencii 2000Hz a 2005Hz zadajte "
 "tone://2000;2005"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Generátor tónov:"
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Slepý výstupný modul"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Neznáma zvuková karta"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Slepý výstupný modul"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "O module Ogg Vorbis Audio"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr " ID3 značka "
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Nastavenie modulu Ogg Vorbis"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Značky Ogg Vorbis:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Formát názvu:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "Nastavenia zosilnenia prehrávania:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "Typ zosilnenia:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "použiť zosilnenie podľa vrcholu v skladbe"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "použiť zosilnenie podľa vrcholu na albume"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "Povoliť 6dB zosilnenie a pevné obmedzenie"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Klasický rok"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Country"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Tanečná hudba"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disko"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Funk"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-Hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Oldies"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Klasický rok"
+msgid "Other"
+msgstr "Iná"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Country"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Tanečná hudba"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Disko"
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Funk"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Grunge"
+msgid "Rock"
+msgstr "Rock"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Jazz"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Metal"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "New Age"
+msgid "Techno"
+msgstr "Techno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Industrial"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternatívna hudba"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Oldies"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Iná"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Žarty"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Techno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Industrial"
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vokálna"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternatívna hudba"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Žarty"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Soundtrack"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambient"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vokálna"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Fúzia"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Trance"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Inštrumentálna"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Acid"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Hra"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Zvukový klip"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Ruch"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "Alternatívny rock"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bass"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Space"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
+msgid "Meditative"
+msgstr "Meditatívna"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Hra"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Zvukový klip"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Ruch"
+msgid "Instrumental Pop"
+msgstr "Inštrumentálny pop"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "Alternatívny rock"
+msgid "Instrumental Rock"
+msgstr "Inštrumentálny rock"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Etnická hudba"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gotická hudba"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bass"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Techno-Industrial"
+msgstr "Techno-Industrial"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Space"
+msgid "Electronic"
+msgstr "Elektronická"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditatívna"
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Inštrumentálny pop"
+msgid "Dream"
+msgstr "Dream"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Inštrumentálny rock"
+msgid "Southern Rock"
+msgstr "Južanský rock"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Etnická hudba"
+msgid "Comedy"
+msgstr "Komédia"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gotická hudba"
+msgid "Cult"
+msgstr "Cult"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Techno-Industrial"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Elektronická"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Dream"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Južanský rock"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Komédia"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Cult"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Kresťanský rap"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Pop/Funk"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Indiánska hudba"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Kabaret"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "Nová vlna"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelická"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Upútavka"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid Punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelická"
+msgid "Musical"
+msgstr "Muzikál"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
+msgid "Rock & Roll"
+msgstr "Rock'n'roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Upútavka"
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Národná ľudová"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
+msgid "Bebob"
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
+msgid "Latin"
+msgstr "Latinská"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Muzikál"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Rock'n'roll"
+msgid "Celtic"
+msgstr "Keltská"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Hard Rock"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Folk"
+msgid "Avantgarde"
+msgstr "Avantgardná"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Národná ľudová"
+msgid "Gothic Rock"
+msgstr "Gotický rock"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
+msgid "Progressive Rock"
+msgstr "Progresívny rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+msgid "Psychedelic Rock"
+msgstr "Psychedelický rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
+msgid "Symphonic Rock"
+msgstr "Symfonický rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Latinská"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
+msgid "Slow Rock"
+msgstr "Slow Rock"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Keltská"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chorus"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantgardná"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Gotický rock"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Progresívny rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Psychedelický rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Symfonický rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Slow Rock"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chorus"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Príjemné počúvanie"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Akustická"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Humor"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Hovorené slovo"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Šansón"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Opera"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Komorná hudba"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonáta"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Symfónia"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Satira"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Club"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Symfónia"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Booty Bass"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folklór"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Balada"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Rocková balada"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Satira"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Club"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folklór"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Balada"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Rocková balada"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Rytmický soul"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Duet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Drum Solo"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "A Cappella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terror"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "BritPop"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Kresťanský Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Moderná kresťanská"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Kresťanský rock"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5553,126 +5749,126 @@
 "Nastala chyba:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Chyba!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Nepodarilo sa zmeniť značku (otvorenie)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Nepodarilo sa zmeniť značku (uzatvorenie)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Nepodarilo sa zmeniť značku"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr " Popis súboru Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Dátum:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Verzia:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "ISRC číslo:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Zosilnenie Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Zosilnenie skladby:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Vrchol skladby:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Zosilnenie albumu:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Vrchol albumu:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Informácie o súbore Ogg Vorbis "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Dátový tok:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Vzorkovacia frekvencia:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Dĺžka:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Veľkosť súboru:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "neznáme"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d kb/s (nominálny)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d bajtov"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O module Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5808,11 +6004,11 @@
 msgid "General Plugin Settings:"
 msgstr "Nastavenia zosilnenia prehrávania:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "O podpore sndfile WAV"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5851,14 +6047,30 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "Modul sndfile WAV"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "O %s"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Softvérové ovládanie hlasitosti"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "Kým ste v režime reálneho času, nemôžete\n"
+#~ "modul Disk Writer použiť."
 
 #, fuzzy
 #~ msgid "Subtune Control"
@@ -5869,10 +6081,6 @@
 #~ msgstr "Používať vlastný formát názvu"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Formát názvu:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Ovládanie hlasitosti:"
 
@@ -6333,9 +6541,6 @@
 #~ msgid "Convert character set from :"
 #~ msgstr "Zmeniť znakovú sadu z:"
 
-#~ msgid "to :"
-#~ msgstr "na:"
-
 #~ msgid "Disable bitrate update during playback (saves cpu usage)"
 #~ msgstr ""
 #~ "Počas prehrávania neobnovovať informácie o dátovom toku (znižuje "
@@ -6359,9 +6564,6 @@
 #~ msgid "Noise shaping"
 #~ msgstr "Tvarovanie šumu"
 
-#~ msgid "none"
-#~ msgstr "žiadne"
-
 #~ msgid "low"
 #~ msgstr "nízke"
 
--- a/po/tr.po	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/tr.po	Thu Nov 01 15:38:07 2007 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aaudacious-plugins\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"POT-Creation-Date: 2007-10-18 21:38+0200\n"
 "PO-Revision-Date: 2007-05-23 00:00+0300\n"
 "Last-Translator: Murat Şenel <muratasenel@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -18,51 +18,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/aac/src/libmp4.c:291
+#: src/aac/libmp4.c:285
 msgid "Using libfaad2-"
 msgstr ""
 
-#: src/aac/src/libmp4.c:292
+#: src/aac/libmp4.c:286
 msgid ""
 " for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/src/libmp4.c:296
+#: src/aac/libmp4.c:290
 #, fuzzy
 msgid "About MP4 AAC player plugin"
 msgstr "Flac Eklentisi Hakkında"
 
-#: src/aac/src/libmp4.c:298 src/adplug/adplug-xmms.cc:185
-#: src/adplug/adplug-xmms.cc:268 src/adplug/adplug-xmms.cc:529
-#: src/alac/plugin.c:88 src/arts/arts.c:26 src/arts/configure.c:90
-#: src/audiocompress/audacious-glue.c:106
-#: src/audiocompress/audacious-glue.c:556 src/cdaudio-ng/configure.c:144
-#: src/console/Audacious_Driver.cxx:500 src/echo_plugin/gui.c:27
-#: src/echo_plugin/gui.c:138 src/esd/about.c:49
-#: src/filewriter/filewriter.c:184 src/jack/configure.c:140
-#: src/jack/jack.c:602 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
-#: src/madplug/plugin.c:597 src/madplug/plugin.c:620
-#: src/metronom/metronom.c:87 src/modplug/gui/main.cxx:45
-#: src/musepack/libmpc.cxx:231 src/null/null.c:67 src/null/null.c:110
-#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal/plugin.c:288
-#: src/rovascope/plugin.c:294 src/scrobbler/gtkstuff.c:24
-#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:56
-#: src/stereo_plugin/stereo.c:119 src/sun/about.c:38 src/sun/configure.c:559
-#: src/timidity/src/interface.c:224 src/timidity/src/xmms-timidity.c:136
-#: src/tonegen/tonegen.c:62 src/tta/libtta.c:171 src/tta/libtta.c:285
-#: src/tta/libtta.c:420 src/vorbis/fileinfo.c:212 src/vorbis/vorbis.c:880
+#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180
+#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524
+#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90
+#: src/audiocompress/audacious-glue.c:102
+#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206
+#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:137 src/esd/about.c:49
+#: src/filewriter/filewriter.c:178 src/jack/configure.c:141
+#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236
+#: src/madplug/plugin.c:596 src/madplug/plugin.c:619
+#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46
+#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110
+#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283
+#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25
+#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53
+#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559
+#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117
+#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265
+#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863
 #: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56
-#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:566
+#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543
 msgid "Ok"
 msgstr "Tamam"
 
-#: src/adplug/adplug-xmms.cc:174
+#: src/adplug/adplug-xmms.cc:169
 msgid "About "
 msgstr "Hakkında"
 
-#: src/adplug/adplug-xmms.cc:178
+#: src/adplug/adplug-xmms.cc:173
 msgid ""
 "\n"
 "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
@@ -85,223 +85,226 @@
 "kullanmaktadır.\n"
 "AdPlug Eklentisinin Sürüm Numarası: "
 
-#: src/adplug/adplug-xmms.cc:259
+#: src/adplug/adplug-xmms.cc:254
 #, fuzzy
 msgid "AdPlug :: Configuration"
 msgstr "AMIDI-Plug - Yapılandırması"
 
-#: src/adplug/adplug-xmms.cc:278 src/alarm/interface.c:1400
-#: src/alsa/configure.c:411 src/arts/configure.c:91
-#: src/audiocompress/audacious-glue.c:561 src/cdaudio-ng/configure.c:148
-#: src/echo_plugin/gui.c:146 src/jack/configure.c:147
-#: src/modplug/gui/interface.cxx:741 src/musepack/libmpc.cxx:236
-#: src/musepack/libmpc.cxx:556 src/null/null.c:111 src/sid/xmms-sid.glade:2930
-#: src/sid/xs_interface.c:1192 src/stereo_plugin/stereo.c:128
-#: src/sun/configure.c:567 src/timidity/src/interface.c:232
-#: src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
+#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398
+#: src/alsa/configure.c:389 src/arts/configure.c:91
+#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210
+#: src/echo_plugin/gui.c:145 src/jack/configure.c:148
+#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648
+#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111
+#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250
+#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567
+#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/adplug/adplug-xmms.cc:294 src/console/Audacious_Config.cxx:146
-#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:325
-#: src/modplug/gui/interface.cxx:833
+#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145
+#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618
+#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384
+#: src/modplug/gui/modplug.glade:1784
 msgid "General"
 msgstr "Genel"
 
-#: src/adplug/adplug-xmms.cc:306
+#: src/adplug/adplug-xmms.cc:301
 #, fuzzy
 msgid "Sound quality"
 msgstr "Ses Klibi"
 
-#: src/adplug/adplug-xmms.cc:311 src/modplug/gui/interface.cxx:151
+#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184
+#: src/modplug/gui/modplug.glade:113
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-#: src/adplug/adplug-xmms.cc:313
+#: src/adplug/adplug-xmms.cc:308
 #, fuzzy
 msgid "8bit"
 msgstr "8 bit"
 
-#: src/adplug/adplug-xmms.cc:318
+#: src/adplug/adplug-xmms.cc:313
 #, fuzzy
 msgid "16bit"
 msgstr "16 bit"
 
-#: src/adplug/adplug-xmms.cc:326 src/modplug/gui/interface.cxx:181
-#: src/timidity/src/interface.c:150
+#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215
+#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148
 msgid "Channels"
 msgstr "Kanallar"
 
-#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
-#: src/timidity/src/interface.c:167
+#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288
+#: src/timidity/interface.c:165
 msgid "Mono"
 msgstr "Mono"
 
-#: src/adplug/adplug-xmms.cc:333 src/filewriter/mp3.c:894
-#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
-#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
+#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894
+#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159
+#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295
+#: src/timidity/interface.c:173
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/adplug/adplug-xmms.cc:337
+#: src/adplug/adplug-xmms.cc:332
 msgid ""
 "Setting stereo is not recommended, unless you need to. This won't add any "
 "stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:345
+#: src/adplug/adplug-xmms.cc:340
 msgid "Frequency"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:381 src/adplug/adplug-xmms.cc:585
-#: src/console/Audacious_Config.cxx:148
+#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580
+#: src/console/Audacious_Config.cxx:147
 msgid "Playback"
 msgstr "Çal"
 
-#: src/adplug/adplug-xmms.cc:385
+#: src/adplug/adplug-xmms.cc:380
 msgid "Detect songend"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:389
+#: src/adplug/adplug-xmms.cc:384
 msgid ""
 "If enabled, XMMS will detect a song's ending, stop it and advance in the "
 "playlist. If disabled, XMMS won't take notice of a song's ending and loop it "
 "all over again and again."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:400
+#: src/adplug/adplug-xmms.cc:395
 #, fuzzy
 msgid "Formats"
 msgstr "Biçim:"
 
-#: src/adplug/adplug-xmms.cc:407
+#: src/adplug/adplug-xmms.cc:402
 #, fuzzy
 msgid "Format selection"
 msgstr "Backend bölümü"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 #, fuzzy
 msgid "Format"
 msgstr "Biçim:"
 
-#: src/adplug/adplug-xmms.cc:410
+#: src/adplug/adplug-xmms.cc:405
 msgid "Extension"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:450
+#: src/adplug/adplug-xmms.cc:445
 msgid ""
 "Selected file types will be recognized and played back by this plugin. "
 "Deselected types will be ignored to make room for other plugins to play "
 "these files."
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:536
+#: src/adplug/adplug-xmms.cc:531
 msgid "AdPlug :: File Info"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:558 src/amidi-plug/i_configure-fluidsynth.c:448
+#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448
 msgid "Filename"
 msgstr "Dosya adı"
 
-#: src/adplug/adplug-xmms.cc:562
+#: src/adplug/adplug-xmms.cc:557
 #, fuzzy
 msgid "Title: "
 msgstr "Başlık:"
 
-#: src/adplug/adplug-xmms.cc:563
+#: src/adplug/adplug-xmms.cc:558
 msgid "Author: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:564
+#: src/adplug/adplug-xmms.cc:559
 #, fuzzy
 msgid "File Type: "
 msgstr "Dosya boytu:"
 
-#: src/adplug/adplug-xmms.cc:565
+#: src/adplug/adplug-xmms.cc:560
 msgid "Subsongs: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:566
+#: src/adplug/adplug-xmms.cc:561
 #, fuzzy
 msgid "Instruments: "
 msgstr "Enstrümantal"
 
-#: src/adplug/adplug-xmms.cc:571
+#: src/adplug/adplug-xmms.cc:566
 msgid "Orders: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:572
+#: src/adplug/adplug-xmms.cc:567
 msgid "Patterns: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:576
+#: src/adplug/adplug-xmms.cc:571
 #, fuzzy
 msgid "Song"
 msgstr "Swing"
 
-#: src/adplug/adplug-xmms.cc:602
+#: src/adplug/adplug-xmms.cc:597
 #, fuzzy
 msgid "Instrument name"
 msgstr "Enstrümantal"
 
-#: src/adplug/adplug-xmms.cc:644
+#: src/adplug/adplug-xmms.cc:639
 #, fuzzy
 msgid "Song message"
 msgstr "Şarkı Değişimi %s"
 
-#: src/adplug/adplug-xmms.cc:666
+#: src/adplug/adplug-xmms.cc:661
 #, fuzzy
 msgid "Subsong selection"
 msgstr "Backend bölümü"
 
-#: src/adplug/adplug-xmms.cc:730
+#: src/adplug/adplug-xmms.cc:725
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:731
+#: src/adplug/adplug-xmms.cc:726
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:733
+#: src/adplug/adplug-xmms.cc:728
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:734
+#: src/adplug/adplug-xmms.cc:729
 #, fuzzy
 msgid "Speed: "
 msgstr "Konuşma"
 
-#: src/adplug/adplug-xmms.cc:735
+#: src/adplug/adplug-xmms.cc:730
 #, fuzzy
 msgid "Timer: "
 msgstr "Zaman Böl:"
 
-#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
+#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341
 msgid "Hz"
 msgstr "Hz"
 
-#: src/alac/plugin.c:85
+#: src/alac/plugin.c:74
 #, fuzzy
 msgid "About Apple Lossless Audio Plugin"
 msgstr "OGG Vorbis Ses Eklentisi Hakkında"
 
-#: src/alac/plugin.c:86
+#: src/alac/plugin.c:75
 msgid ""
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
 
-#: src/alarm/interface.c:36
+#: src/alarm/interface.c:34
 msgid "About XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:49
+#: src/alarm/interface.c:47
 msgid "XMMS Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:58
+#: src/alarm/interface.c:56
 msgid ""
 "An XMMS plugin which can be used\n"
 "to start playing at a certain time.\n"
@@ -313,42 +316,44 @@
 "http://www.snika.uklinux.net/xmms-alarm/"
 msgstr ""
 
-#: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
-#: src/sid/xs_interface.c:1671
+#: src/alarm/interface.c:71 src/lirc/about.c:114
+#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010
+#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213
+#: src/sid/xs_interface.c:1740
 msgid "Close"
 msgstr "Kapat"
 
-#: src/alarm/interface.c:103
+#: src/alarm/interface.c:101
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:111
+#: src/alarm/interface.c:109
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:126 src/alarm/interface.c:1391 src/alsa/about.c:46
-#: src/alsa/configure.c:405 src/cdaudio-ng/cdaudio-ng.c:206
-#: src/filewriter/filewriter.c:201 src/flacng/plugin.c:743
-#: src/modplug/gui/interface.cxx:725 src/pulse_audio/pulse_audio.c:694
-#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
-#: src/sid/xs_interface.c:1185
+#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46
+#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217
+#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290
+#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692
+#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692
+#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066
+#: src/sid/xs_interface.c:1243
 msgid "OK"
 msgstr "Tamam"
 
-#: src/alarm/interface.c:154
+#: src/alarm/interface.c:152
 msgid "Select Playlist"
 msgstr ""
 
-#: src/alarm/interface.c:198
+#: src/alarm/interface.c:196
 msgid "Sorry"
 msgstr ""
 
-#: src/alarm/interface.c:206
+#: src/alarm/interface.c:204
 msgid "Warning"
 msgstr ""
 
-#: src/alarm/interface.c:215
+#: src/alarm/interface.c:213
 msgid ""
 "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
 "than the fading time, it must also be more than 10 seconds.  This basically "
@@ -361,171 +366,171 @@
 "Adam"
 msgstr ""
 
-#: src/alarm/interface.c:231
+#: src/alarm/interface.c:229
 msgid "Oh Well"
 msgstr ""
 
-#: src/alarm/interface.c:390
+#: src/alarm/interface.c:388
 #, fuzzy
 msgid "Alarm Settings"
 msgstr "Karıştırıcı Ayarları:"
 
-#: src/alarm/interface.c:406 src/alarm/interface.c:578
-#: src/alarm/interface.c:950
+#: src/alarm/interface.c:404 src/alarm/interface.c:576
+#: src/alarm/interface.c:948
 #, fuzzy
 msgid "Time"
 msgstr "Başlık"
 
-#: src/alarm/interface.c:447
+#: src/alarm/interface.c:445
 #, fuzzy
 msgid "hours"
 msgstr "Chorus"
 
-#: src/alarm/interface.c:508
+#: src/alarm/interface.c:506
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:538
+#: src/alarm/interface.c:536
 msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:556
+#: src/alarm/interface.c:554
 #, fuzzy
 msgid "Quiet after:"
 msgstr "Bit oranı:"
 
-#: src/alarm/interface.c:566
+#: src/alarm/interface.c:564
 msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:586
+#: src/alarm/interface.c:584
 msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:614 src/alarm/interface.c:662
-#: src/alarm/interface.c:710 src/alarm/interface.c:758
-#: src/alarm/interface.c:806 src/alarm/interface.c:854
-#: src/alarm/interface.c:902 src/OSS4/configure.c:138 src/OSS/configure.c:170
+#: src/alarm/interface.c:612 src/alarm/interface.c:660
+#: src/alarm/interface.c:708 src/alarm/interface.c:756
+#: src/alarm/interface.c:804 src/alarm/interface.c:852
+#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169
 msgid "Default"
 msgstr "Varsayılan"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:938
 msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:960
+#: src/alarm/interface.c:958
 msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:971
+#: src/alarm/interface.c:969
 msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:982
+#: src/alarm/interface.c:980
 msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:993
+#: src/alarm/interface.c:991
 msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:1004
+#: src/alarm/interface.c:1002
 msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:1013
 #, fuzzy
 msgid "Sunday"
 msgstr "Soundtrack"
 
-#: src/alarm/interface.c:1025
+#: src/alarm/interface.c:1023
 #, fuzzy
 msgid "Monday"
 msgstr "Mono"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:1034
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:1052
+#: src/alarm/interface.c:1050
 #, fuzzy
 msgid "Fading"
 msgstr "Geciktirme:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2007
-#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2526
-#: src/sid/xs_interface.c:900 src/sid/xs_interface.c:954
-#: src/sid/xs_interface.c:1064
+#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007
+#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676
+#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
+#: src/sid/xs_interface.c:1122
 #, fuzzy
 msgid "seconds"
 msgstr "saniye"
 
-#: src/alarm/interface.c:1097 src/alarm/interface.c:1213
-#: src/modplug/gui/interface.cxx:635
+#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
+#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113
 #, fuzzy
 msgid "Volume"
 msgstr "Ses: (%)"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:1121
 msgid "Current"
 msgstr ""
 
+#: src/alarm/interface.c:1128
+msgid "reset to current output volume"
+msgstr ""
+
 #: src/alarm/interface.c:1130
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1132
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:1160 src/alarm/interface.c:1204
+#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
 #, fuzzy
 msgid "%"
 msgstr "%d"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1174
 #, fuzzy
 msgid "Final"
 msgstr "Dosya adı"
 
-#: src/alarm/interface.c:1229
+#: src/alarm/interface.c:1227
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1255
+#: src/alarm/interface.c:1253
 #, fuzzy
 msgid "enable"
 msgstr "Genel"
 
-#: src/alarm/interface.c:1263
+#: src/alarm/interface.c:1261
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1289
+#: src/alarm/interface.c:1287
 #, fuzzy
 msgid "Browse..."
 msgstr "Araştır"
 
-#: src/alarm/interface.c:1297 src/alarm/interface.c:1462
+#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
 #, fuzzy
 msgid "Reminder"
 msgstr "İşleme Stili"
 
-#: src/alarm/interface.c:1314
+#: src/alarm/interface.c:1312
 #, fuzzy
 msgid "Use reminder"
 msgstr "Kullanıcı Tanımlı"
 
-#: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
+#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377
 #, fuzzy
 msgid "Options"
 msgstr "Seçenekler:"
 
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:1336
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1366
+#: src/alarm/interface.c:1364
 msgid ""
 "\n"
 "Time\n"
@@ -580,15 +585,15 @@
 "    toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1368
+#: src/alarm/interface.c:1366
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1470
+#: src/alarm/interface.c:1468
 msgid "Your reminder for today is.."
 msgstr ""
 
-#: src/alarm/interface.c:1495
+#: src/alarm/interface.c:1493
 #, fuzzy
 msgid "Thankyou"
 msgstr "Tango"
@@ -637,57 +642,53 @@
 "USA.\n"
 " Yazan: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/alsa/configure.c:150
+#: src/alsa/configure.c:146
 msgid "Unknown soundcard"
 msgstr "Bilinmeyen ses kartı"
 
-#: src/alsa/configure.c:205
+#: src/alsa/configure.c:201
 #, c-format
 msgid "Default PCM device (%s)"
 msgstr "Varsayılan PCM aygıtı (%s)"
 
-#: src/alsa/configure.c:271
+#: src/alsa/configure.c:260
 msgid "ALSA Driver configuration"
 msgstr "ALSA Sürücüsü ayarları"
 
-#: src/alsa/configure.c:285 src/OSS4/configure.c:186 src/OSS/configure.c:218
+#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217
 #: src/sun/configure.c:183
 msgid "Audio device:"
 msgstr "Ses aygıtı:"
 
-#: src/alsa/configure.c:299
+#: src/alsa/configure.c:288
 msgid "Mixer:"
 msgstr "Karıştırıcı:"
 
-#: src/alsa/configure.c:307
-msgid "Use software volume control"
-msgstr "Yazılımsal ses kontrolü kullan"
-
-#: src/alsa/configure.c:317
+#: src/alsa/configure.c:300
 msgid "Mixer card:"
 msgstr "Karıştırıcı kart:"
 
-#: src/alsa/configure.c:330 src/OSS/configure.c:261 src/sun/configure.c:220
+#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220
 msgid "Mixer device:"
 msgstr "Karıştırıcı aygıt:"
 
-#: src/alsa/configure.c:350
+#: src/alsa/configure.c:328
 msgid "Device settings"
 msgstr "Karıştırıcı ayarları"
 
-#: src/alsa/configure.c:356
+#: src/alsa/configure.c:334
 msgid "Soundcard:"
 msgstr "Ses kartı:"
 
-#: src/alsa/configure.c:369
+#: src/alsa/configure.c:347
 msgid "Buffer time (ms):"
 msgstr "Tampon zamanı (ms):"
 
-#: src/alsa/configure.c:383
+#: src/alsa/configure.c:361
 msgid "Period time (ms):"
 msgstr "Periyot zamanı (ms):"
 
-#: src/alsa/configure.c:398 src/amidi-plug/i_configure-ap.c:287
+#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287
 msgid "Advanced settings"
 msgstr "Gelişmiş ayarlar"
 
@@ -1325,8 +1326,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">varsayılan</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
-#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465
+#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559
 msgid "Name:"
 msgstr "İsim:"
 
@@ -1427,23 +1428,23 @@
 msgid "Concave Rectangle"
 msgstr "Konkav Dikdörtgen"
 
-#: src/aosd/aosd_style.c:87
+#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/aosd/aosd_trigger.c:73
-msgid "Playback Start"
-msgstr "Çal"
-
 #: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Çal"
+
+#: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Playlist yüklendiğinde görsel öğeyi oynat"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
 msgstr "Başlık Değiştirme"
 
-#: src/aosd/aosd_trigger.c:79
+#: src/aosd/aosd_trigger.c:80
 #, fuzzy
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
@@ -1453,30 +1454,30 @@
 "Şarkı başladığında görünen şarkı başlığı değişir, fakat dosya adı aynıkalır. "
 "İnternet den inen akıcı dosyaları çalarken kullanışlı oluyor. "
 
-#: src/aosd/aosd_trigger.c:85
+#: src/aosd/aosd_trigger.c:86
 #, fuzzy
 msgid "Volume Change"
 msgstr "Başlık Değiştirme"
 
-#: src/aosd/aosd_trigger.c:86
+#: src/aosd/aosd_trigger.c:87
 #, fuzzy
 msgid "Triggers OSD when volume is changed."
 msgstr "Playlist yüklendiğinde görsel öğeyi oynat"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Pause On"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:91
+#: src/aosd/aosd_trigger.c:92
 #, fuzzy
 msgid "Triggers OSD when playback is paused."
 msgstr "Playlist yüklendiğinde görsel öğeyi oynat"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Pause Off"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:96
+#: src/aosd/aosd_trigger.c:97
 #, fuzzy
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Playlist yüklendiğinde görsel öğeyi oynat"
@@ -1556,122 +1557,123 @@
 msgid "Select Skin File"
 msgstr "Arayüz dosyası seçin"
 
-#: src/aosd/aosd_ui.c:583
+#: src/aosd/aosd_ui.c:586
 msgid "Render Style"
 msgstr "İşleme Stili"
 
-#: src/aosd/aosd_ui.c:599
+#: src/aosd/aosd_ui.c:602
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/aosd/aosd_ui.c:612
+#: src/aosd/aosd_ui.c:615
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Renkler"
 
-#: src/aosd/aosd_ui.c:632
+#: src/aosd/aosd_ui.c:635
 msgid "Custom Skin"
 msgstr "Geçerli Arayüz"
 
-#: src/aosd/aosd_ui.c:638
+#: src/aosd/aosd_ui.c:641
 msgid "Skin file:"
 msgstr "Arayüz Dosyası:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2331
-#: src/sid/xmms-sid.glade:2706 src/sid/xmms-sid.glade:2812
-#: src/sid/xs_interface.c:1002 src/sid/xs_interface.c:1124
-#: src/sid/xs_interface.c:1160
+#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331
+#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962
+#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182
+#: src/sid/xs_interface.c:1218
 msgid "Browse"
 msgstr "Araştır"
 
-#: src/aosd/aosd_ui.c:743
+#: src/aosd/aosd_ui.c:746
 msgid "Enable trigger"
 msgstr "Tetikleyici Aktif"
 
-#: src/aosd/aosd_ui.c:770
+#: src/aosd/aosd_ui.c:773
 msgid "Event"
 msgstr "Olay"
 
-#: src/aosd/aosd_ui.c:798
+#: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:805
+#: src/aosd/aosd_ui.c:808
 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.c:813
+#: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:851
+#: src/aosd/aosd_ui.c:854
 #, fuzzy
 msgid "Transparency"
 msgstr "Transpoze:"
 
-#: src/aosd/aosd_ui.c:857
+#: src/aosd/aosd_ui.c:860
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:859
+#: src/aosd/aosd_ui.c:862
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:901
+#: src/aosd/aosd_ui.c:904
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:909
+#: src/aosd/aosd_ui.c:912
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:934
 #, c-format
 msgid "<span font_desc='%s'>Audacious OSD</span>"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1015
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - yapılandırması"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1036
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1051
 msgid "Position"
 msgstr "Konum"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1056
 msgid "Animation"
 msgstr "Animasyon"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1061
 msgid "Text"
 msgstr "Yazı"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1066
 msgid "Decoration"
 msgstr "Dekorasyon"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1071
 msgid "Trigger"
 msgstr "Başlat"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
+#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149
+#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583
+#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1113
 msgid "Audacious OSD - about"
 msgstr "Audacius OSD - Hakkında"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1143
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1679,7 +1681,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1144
 #, fuzzy
 msgid ""
 "\n"
@@ -1719,25 +1721,25 @@
 msgstr "aRTS Ses Sürücüsü ayarları"
 
 #: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232
-#: src/OSS/configure.c:305 src/sun/configure.c:259
+#: src/OSS/configure.c:304 src/sun/configure.c:259
 msgid "Buffering:"
 msgstr "Tamponlama:"
 
 #: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245
-#: src/OSS/configure.c:318 src/sun/configure.c:272
+#: src/OSS/configure.c:317 src/sun/configure.c:272
 msgid "Buffer size (ms):"
 msgstr "Tampon boyutu (ms):"
 
 #: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270
-#: src/OSS/configure.c:343 src/sun/configure.c:304
+#: src/OSS/configure.c:342 src/sun/configure.c:304
 msgid "Buffering"
 msgstr "Tamponlama"
 
-#: src/audiocompress/audacious-glue.c:99
+#: src/audiocompress/audacious-glue.c:95
 msgid "AudioCompress "
 msgstr "AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:100
+#: src/audiocompress/audacious-glue.c:96
 msgid ""
 "\n"
 "(c)2003 trikuare studios(http://trikuare.cx)\n"
@@ -1753,119 +1755,124 @@
 "Temiz sıkıştırma için kullanabileceğiniz\n"
 "ses seviyesini normal değerlerde tutan bir işleyici"
 
-#: src/audiocompress/audacious-glue.c:105
+#: src/audiocompress/audacious-glue.c:101
 msgid "About AudioCompress"
 msgstr "AudioCompress Hakkında"
 
-#: src/audiocompress/audacious-glue.c:324
+#: src/audiocompress/audacious-glue.c:320
 msgid ""
 "If checked, when the sound peaks the volume will be cut instantly; "
 "otherwise, it will ramp down just in time for the peak (but some minor "
 "clipping may still occur)."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:328
+#: src/audiocompress/audacious-glue.c:324
 msgid "The maximum amount to amplify the audio by"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:330
+#: src/audiocompress/audacious-glue.c:326
 msgid "Defines how smoothly the volume will ramp up"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:332
+#: src/audiocompress/audacious-glue.c:328
 msgid ""
 "The target audio level for ramping up. Lowering the value gives a bit more "
 "dynamic range for peaks, but will make the overall sound quieter."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:335
+#: src/audiocompress/audacious-glue.c:331
 msgid "How long of a window to maintain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:376
+#: src/audiocompress/audacious-glue.c:372
 #, fuzzy
 msgid "AudioCompress preferences"
 msgstr "AudioCompress"
 
-#: src/audiocompress/audacious-glue.c:393
+#: src/audiocompress/audacious-glue.c:389
 msgid " Quality Options "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:398
+#: src/audiocompress/audacious-glue.c:394
 msgid " Aggressively prevent clipping"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:410
+#: src/audiocompress/audacious-glue.c:406
 msgid " Target & gain"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:421
+#: src/audiocompress/audacious-glue.c:417
 msgid "Target audio level:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:429
+#: src/audiocompress/audacious-glue.c:425
 #, fuzzy
 msgid "Maximum gain:"
 msgstr "Albüm ses yüksekliği:"
 
-#: src/audiocompress/audacious-glue.c:437
+#: src/audiocompress/audacious-glue.c:433
 msgid "Gain smooth:"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:489
+#: src/audiocompress/audacious-glue.c:485
 msgid " History "
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:521
+#: src/audiocompress/audacious-glue.c:517
 msgid ""
 "How long of a history to maintain.  A higher number will make the volume "
 "changes less responsive."
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:532
+#: src/audiocompress/audacious-glue.c:528
 msgid "Load default values"
 msgstr ""
 
-#: src/audiocompress/audacious-glue.c:537
+#: src/audiocompress/audacious-glue.c:533
 #, fuzzy
 msgid "Audio values"
 msgstr "Ses aygıtı:"
 
-#: src/audiocompress/audacious-glue.c:566 src/echo_plugin/gui.c:153
-#: src/modplug/gui/interface.cxx:733 src/stereo_plugin/stereo.c:135
+#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152
+#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635
+#: src/stereo_plugin/stereo.c:132
 msgid "Apply"
 msgstr "Uygula"
 
+#: src/blur_scope/blur_scope.c:54
+msgid "/Toggle Decorations"
+msgstr "/Geçiş Dekorasyonları"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "/-"
+msgstr "/-"
+
 #: src/blur_scope/blur_scope.c:57
-msgid "/Toggle Decorations"
-msgstr "/Geçiş Dekorasyonları"
-
-#: src/blur_scope/blur_scope.c:59
-msgid "/-"
-msgstr "/-"
-
-#: src/blur_scope/blur_scope.c:60
 msgid "/Close"
 msgstr "/Kapat"
 
-#: src/blur_scope/blur_scope.c:190
+#: src/blur_scope/blur_scope.c:181
 msgid "Blur scope"
 msgstr "Bulanık Alan"
 
-#: src/blur_scope/config.c:73
+#: src/blur_scope/config.c:72
 msgid "Blur Scope: Color selection"
 msgstr "Bulanık alan: Renk seçimi"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:107
+#: src/blur_scope/config.c:82 src/jack/configure.c:108
 msgid "Options:"
 msgstr "Seçenekler:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:187
 msgid "Add CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:201
-#, c-format
+#: src/cdaudio-ng/cdaudio-ng.c:212
+#, fuzzy
+msgid "About CD Audio Plugin NG"
+msgstr "LIRC Audacious Eklentisi Hakkında"
+
+#: src/cdaudio-ng/cdaudio-ng.c:213
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1878,109 +1885,105 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:206
-#, fuzzy
-msgid "About CD Audio Plugin NG"
-msgstr "LIRC Audacious Eklentisi Hakkında"
-
-#: src/cdaudio-ng/cdaudio-ng.c:801
+#: src/cdaudio-ng/cdaudio-ng.c:802
 msgid ""
 "<b><big>No playable CD found.</big></b>\n"
 "\n"
 "No CD inserted, or inserted CD is not an audio CD.\n"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:67
+#: src/cdaudio-ng/configure.c:129
 #, fuzzy
 msgid "CD Audio Plugin Configuration"
 msgstr "MPEG Ses Eklentisi Yapılandırması"
 
-#: src/cdaudio-ng/configure.c:77
+#: src/cdaudio-ng/configure.c:139
 msgid "Digital audio extraction"
 msgstr "Sayısal ses elde etme"
 
-#: src/cdaudio-ng/configure.c:82
+#: src/cdaudio-ng/configure.c:144
 #, fuzzy
 msgid "Title information"
 msgstr "Başlık biçimi:"
 
-#: src/cdaudio-ng/configure.c:99
+#: src/cdaudio-ng/configure.c:161
 msgid "Limit read speed to: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:106
+#: src/cdaudio-ng/configure.c:168
 msgid "Use cd-text if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:110
+#: src/cdaudio-ng/configure.c:172
 msgid "Use CDDB if available"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:114
+#: src/cdaudio-ng/configure.c:176
 #, fuzzy
 msgid "Server: "
 msgstr "Sunucu"
 
-#: src/cdaudio-ng/configure.c:117
+#: src/cdaudio-ng/configure.c:179
 #, fuzzy
 msgid "Port: "
 msgstr "Port:"
 
-#: src/cdaudio-ng/configure.c:127
+#: src/cdaudio-ng/configure.c:189
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:134
+#: src/cdaudio-ng/configure.c:196
 msgid "Print debug information"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:126
+#: src/console/Audacious_Config.cxx:125
 msgid "Console Music Decoder"
 msgstr "Konsol Müzik Çözücüsü"
 
-#: src/console/Audacious_Config.cxx:163
+#: src/console/Audacious_Config.cxx:162
 msgid "Bass:"
 msgstr "Bas:"
 
-#: src/console/Audacious_Config.cxx:167 src/console/Audacious_Config.cxx:178
-#: src/console/Audacious_Config.cxx:199
+#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177
+#: src/console/Audacious_Config.cxx:198
 msgid "secs"
 msgstr "saniye"
 
-#: src/console/Audacious_Config.cxx:174
+#: src/console/Audacious_Config.cxx:173
 msgid "Treble:"
 msgstr "Tiz:"
 
-#: src/console/Audacious_Config.cxx:195
+#: src/console/Audacious_Config.cxx:194
 msgid "Default song length:"
 msgstr "Varsayılan şarkı uzunluğu:"
 
-#: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
+#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265
+#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243
+#: src/sid/xs_interface.c:653
 msgid "Resampling"
 msgstr "Yeniden örnekleme"
 
-#: src/console/Audacious_Config.cxx:207
+#: src/console/Audacious_Config.cxx:206
 msgid "Enable audio resampling"
 msgstr "Ses örneklemesini etkinleştir"
 
-#: src/console/Audacious_Config.cxx:222
+#: src/console/Audacious_Config.cxx:221
 msgid "Resampling rate:"
 msgstr "Örnekleme oranı:"
 
-#: src/console/Audacious_Config.cxx:237
+#: src/console/Audacious_Config.cxx:236
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/Audacious_Config.cxx:238
+#: src/console/Audacious_Config.cxx:237
 msgid "Ignore length from SPC tags"
 msgstr "SPC etiketlerindeki uzunluğu gözardı et"
 
-#: src/console/Audacious_Config.cxx:239
+#: src/console/Audacious_Config.cxx:238
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/Audacious_Config.cxx:264
+#: src/console/Audacious_Config.cxx:263
 #, fuzzy
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
@@ -1990,11 +1993,11 @@
 "Saniyelerle belirtilen varsayılan şarkı uzunluğu, uzunluk bilgisi bulunmayan "
 "parçalar için kullanılır."
 
-#: src/console/Audacious_Driver.cxx:495
+#: src/console/Audacious_Driver.cxx:444
 msgid "About the Console Music Decoder"
 msgstr "Konsol Müzik Çözücüsü Hakkında"
 
-#: src/console/Audacious_Driver.cxx:496
+#: src/console/Audacious_Driver.cxx:445
 msgid ""
 "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"
@@ -2006,7 +2009,7 @@
 "Audacious için uyarlayan: William Pitcock <nenolod@nenolod.net>, \n"
 "        Shay Green <gblargg@gmail.com>"
 
-#: src/echo_plugin/gui.c:12
+#: src/echo_plugin/gui.c:11
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
@@ -2018,27 +2021,27 @@
 "\n"
 "Surround Eko - Carl van Schaik 1999"
 
-#: src/echo_plugin/gui.c:26
+#: src/echo_plugin/gui.c:25
 msgid "About Echo Plugin"
 msgstr "Yankı (Eko) Eklentisi Hakkında"
 
-#: src/echo_plugin/gui.c:77
+#: src/echo_plugin/gui.c:76
 msgid "Configure Echo"
 msgstr "Yankı (Eko) Eklentisini Yapılandır"
 
-#: src/echo_plugin/gui.c:90
+#: src/echo_plugin/gui.c:89
 msgid "Delay: (ms)"
 msgstr "Gecikme: (ms )"
 
-#: src/echo_plugin/gui.c:95
+#: src/echo_plugin/gui.c:94
 msgid "Feedback: (%)"
 msgstr "Geribesleme: (%)"
 
-#: src/echo_plugin/gui.c:100
+#: src/echo_plugin/gui.c:99
 msgid "Volume: (%)"
 msgstr "Ses: (%)"
 
-#: src/echo_plugin/gui.c:123
+#: src/echo_plugin/gui.c:122
 msgid "Surround echo"
 msgstr "Çevresel Yankı"
 
@@ -2108,7 +2111,7 @@
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:332
+#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331
 #: src/sun/configure.c:290
 msgid "Pre-buffer (percent):"
 msgstr "Ön tampon (yüzde):"
@@ -2292,8 +2295,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
-#: src/madplug/plugin.c:620
+#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619
 msgid "Error"
 msgstr "Hata"
 
@@ -2411,12 +2413,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:169
+#: src/filewriter/filewriter.c:163
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Flac Eklentisi Hakkında"
 
-#: src/filewriter/filewriter.c:170
+#: src/filewriter/filewriter.c:164
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2455,69 +2457,60 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:199
-#, fuzzy
-msgid ""
-"You cannot use the FileWriter plugin\n"
-"when you're running in realtime mode."
-msgstr ""
-"Gerçek zamanlı kipte çalışırken\n"
-"disk yazma eklentisini kullanamazsınız."
-
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:476
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Disk Yazıcı Ayarları"
 
-#: src/filewriter/filewriter.c:526
+#: src/filewriter/filewriter.c:488
 #, fuzzy
 msgid "Output file format:"
 msgstr "Çıktı dosya klasörü:"
 
-#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960
 #, fuzzy
 msgid "Configure"
 msgstr "Yankı (Eko) Eklentisini Yapılandır"
 
-#: src/filewriter/filewriter.c:559
+#: src/filewriter/filewriter.c:521
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:526
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:576
+#: src/filewriter/filewriter.c:538
 msgid "Output file folder:"
 msgstr "Çıktı dosya klasörü:"
 
-#: src/filewriter/filewriter.c:580
+#: src/filewriter/filewriter.c:542
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:600
+#: src/filewriter/filewriter.c:562
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:603
+#: src/filewriter/filewriter.c:565
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:609
+#: src/filewriter/filewriter.c:571
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:619
+#: src/filewriter/filewriter.c:581
 msgid "Don't strip file name extension"
 msgstr "Dosya ismi uzantılarını daraltma"
 
-#: src/filewriter/filewriter.c:623
+#: src/filewriter/filewriter.c:585
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
 msgstr ""
 
-#: src/filewriter/filewriter.c:637
+#: src/filewriter/filewriter.c:599
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2600,8 +2593,8 @@
 msgid "Adds 16 bit checksum to every frame"
 msgstr ""
 
-#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:271
-#: src/modplug/gui/interface.cxx:310
+#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274
+#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487
 msgid "Quality"
 msgstr ""
 
@@ -2707,21 +2700,21 @@
 msgid "Tags"
 msgstr "Etiket:"
 
-#: src/filewriter/vorbis.c:264
+#: src/filewriter/vorbis.c:267
 #, fuzzy
 msgid "Vorbis Encoder Configuration"
 msgstr "Disk Yazıcı Ayarları"
 
-#: src/filewriter/vorbis.c:284
+#: src/filewriter/vorbis.c:287
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:735
+#: src/flacng/plugin.c:718
 #, fuzzy
 msgid "FLAC Audio Plugin "
 msgstr "FLAC Ses Eklentisi"
 
-#: src/flacng/plugin.c:736
+#: src/flacng/plugin.c:719
 msgid ""
 "\n"
 "\n"
@@ -2731,33 +2724,164 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:741
+#: src/flacng/plugin.c:724
 #, fuzzy
 msgid "About FLAC Audio Plugin"
 msgstr "FLAC Ses Eklentisi"
 
-#: src/jack/configure.c:69
+#: src/gnomeshortcuts/gnomeshortcuts.c:285
+#, fuzzy
+msgid "About Gnome Shortcut Plugin"
+msgstr "ESounD Eklentisi Hakkında"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:286
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+
+#: src/hotkey/plugin.c:607
+#, fuzzy
+msgid "(none)"
+msgstr "hiçbiri"
+
+#: src/hotkey/plugin.c:752
+#, fuzzy
+msgid "Global Hotkey Plugin Configuration"
+msgstr "ESD Çıkış Eklentisi yapılandırması"
+
+#: src/hotkey/plugin.c:768
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/hotkey/plugin.c:773
+#, fuzzy
+msgid "<b>Playback:</b>"
+msgstr "Çal"
+
+#: src/hotkey/plugin.c:788
+msgid "<i>Configure keys which controls Audacious playback.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:795
+msgid "Previous Track:"
+msgstr ""
+
+#: src/hotkey/plugin.c:798
+#, fuzzy
+msgid "Play/Pause:"
+msgstr "Durakla"
+
+#: src/hotkey/plugin.c:801
+#, fuzzy
+msgid "Pause:"
+msgstr "Değer:"
+
+#: src/hotkey/plugin.c:804
+#, fuzzy
+msgid "Stop:"
+msgstr "sonu:"
+
+#: src/hotkey/plugin.c:807
+#, fuzzy
+msgid "Next Track:"
+msgstr "Parça ses yüksekliği:"
+
+#: src/hotkey/plugin.c:810
+msgid "Forward 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:813
+msgid "Rewind 5 sec.:"
+msgstr ""
+
+#: src/hotkey/plugin.c:818
+#, fuzzy
+msgid "<b>Volume Control:</b>"
+msgstr "Ses kontrolleri aygıtı:"
+
+#: src/hotkey/plugin.c:833
+msgid "<i>Configure keys which controls music volume.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:841
+#, fuzzy
+msgid "Mute:"
+msgstr "Tarih:"
+
+#: src/hotkey/plugin.c:844
+#, fuzzy
+msgid "Volume Up:"
+msgstr "Ses: (%)"
+
+#: src/hotkey/plugin.c:847
+#, fuzzy
+msgid "Volume Down:"
+msgstr "Sesi 5 Birim Azalt"
+
+#: src/hotkey/plugin.c:852
+#, fuzzy
+msgid "<b>Player:</b>"
+msgstr "<b>İsim: </b>"
+
+#: src/hotkey/plugin.c:867
+msgid "<i>Configure keys which control the player.</i>"
+msgstr ""
+
+#: src/hotkey/plugin.c:873
+msgid "Jump to File:"
+msgstr ""
+
+#: src/hotkey/plugin.c:876
+msgid "Toggle Player Windows:"
+msgstr ""
+
+#: src/hotkey/plugin.c:903
+#, fuzzy
+msgid "About Global Hotkey Plugin"
+msgstr "Scrobbler Eklentisi Hakkında"
+
+#: src/hotkey/plugin.c:904
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+
+#: src/jack/configure.c:70
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:76
+#: src/jack/configure.c:77
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:83
+#: src/jack/configure.c:84
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:98
+#: src/jack/configure.c:99
 #, fuzzy
 msgid "jack Plugin configuration"
 msgstr "ESD Çıkış Eklentisi yapılandırması"
 
-#: src/jack/configure.c:116
+#: src/jack/configure.c:117
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:128
+#: src/jack/configure.c:129
 #, fuzzy
 msgid "Enable debug printing"
 msgstr "Ses titremesini etkinleştir"
@@ -2781,15 +2905,15 @@
 "Chris Morgan <cmorgan@alum.wpi.edu>\n"
 msgstr ""
 
-#: src/jack/jack.c:118 src/wma/wma.c:156
+#: src/jack/jack.c:118 src/wma/wma.c:157
 msgid " Close "
 msgstr " Kapat "
 
-#: src/jack/jack.c:598
+#: src/jack/jack.c:535
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK Çıkış Eklentisi 0.17 Hakkında"
 
-#: src/jack/jack.c:599
+#: src/jack/jack.c:536
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2807,37 +2931,37 @@
 "Audacious uyarlaması\n"
 "develia.org'tan Giacomo Lozito"
 
-#: src/ladspa/ladspa.c:724
+#: src/ladspa/ladspa.c:722
 msgid "This LADSPA plugin has no user controls"
 msgstr ""
 
-#: src/ladspa/ladspa.c:769 src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853
 #, fuzzy
 msgid "Name"
 msgstr "İsim:"
 
-#: src/ladspa/ladspa.c:855
+#: src/ladspa/ladspa.c:853
 msgid "UID"
 msgstr ""
 
-#: src/ladspa/ladspa.c:930
+#: src/ladspa/ladspa.c:928
 msgid "Installed plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:939
+#: src/ladspa/ladspa.c:937
 msgid "Running plugins"
 msgstr ""
 
-#: src/ladspa/ladspa.c:954
+#: src/ladspa/ladspa.c:952
 msgid "Add"
 msgstr ""
 
-#: src/ladspa/ladspa.c:958
+#: src/ladspa/ladspa.c:956
 #, fuzzy
 msgid "Remove"
 msgstr "Etiketi kaldır"
 
-#: src/ladspa/ladspa.c:971
+#: src/ladspa/ladspa.c:969
 msgid "LADSPA Plugin Catalog"
 msgstr ""
 
@@ -2848,15 +2972,15 @@
 "Check if your Scrobbler's plugin login data is set up properly."
 msgstr ""
 
-#: src/lirc/about.c:65
+#: src/lirc/about.c:63
 msgid "About LIRC Audacious Plugin"
 msgstr "LIRC Audacious Eklentisi Hakkında"
 
+#: src/lirc/about.c:90
+msgid "LIRC Plugin "
+msgstr "LIRC Eklentisi"
+
 #: src/lirc/about.c:92
-msgid "LIRC Plugin "
-msgstr "LIRC Eklentisi"
-
-#: src/lirc/about.c:94
 msgid ""
 "\n"
 "A simple plugin that lets you control\n"
@@ -2880,12 +3004,12 @@
 "LIRC hakkında bilgi almak için:\n"
 "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
 
-#: src/lirc/lirc.c:80
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC desteği başlatılamadı\n"
 
-#: src/lirc/lirc.c:88
+#: src/lirc/lirc.c:84
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2896,12 +3020,12 @@
 "%s: lütfen LIRC belgelerini okuyun\n"
 "%s: uygun yapılandırma dosyası nasıl oluşturulur\n"
 
-#: src/lirc/lirc.c:299
+#: src/lirc/lirc.c:295
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: bilinmeyen komut \"%s\"\n"
 
-#: src/lirc/lirc.c:309
+#: src/lirc/lirc.c:305
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: LIRC bağlantısı kesildi\n"
@@ -2954,12 +3078,12 @@
 msgid "Preamp (dB):"
 msgstr "Ön anfi (dB)"
 
-#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:223
-#: src/vorbis/configure.c:221 src/wavpack/ui.cxx:545
+#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224
+#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545
 msgid "ReplayGain"
 msgstr "ReplayGain"
 
-#: src/madplug/configure.c:238 src/vorbis/configure.c:137
+#: src/madplug/configure.c:238 src/vorbis/configure.c:135
 msgid "Override generic titles"
 msgstr "Genel başlıkları geçersiz kıl"
 
@@ -2967,7 +3091,8 @@
 msgid "ID3 format:"
 msgstr "ID3 biçimi:"
 
-#: src/madplug/configure.c:261 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540
+#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158
 msgid "Title"
 msgstr "Başlık"
 
@@ -2998,38 +3123,38 @@
 msgid " ID3 Tag "
 msgstr "ID3 Etiketi"
 
-#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:513 src/tta/libtta.c:341
-#: src/vorbis/fileinfo.c:585 src/wavpack/ui.cxx:170
+#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321
+#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170
 msgid "Title:"
 msgstr "Başlık:"
 
-#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:517 src/tta/libtta.c:351
-#: src/vorbis/fileinfo.c:596 src/wavpack/ui.cxx:182
+#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331
+#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182
 msgid "Artist:"
 msgstr "Sanatçı:"
 
-#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:521 src/tta/libtta.c:362
-#: src/vorbis/fileinfo.c:607 src/wavpack/ui.cxx:194
+#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342
+#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194
 msgid "Album:"
 msgstr "Albüm:"
 
-#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:525 src/tta/libtta.c:373
-#: src/vorbis/fileinfo.c:618 src/wavpack/ui.cxx:206
+#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353
+#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206
 msgid "Comment:"
 msgstr "Yorum:"
 
-#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:529 src/tta/libtta.c:384
+#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364
 #: src/wavpack/ui.cxx:219
 msgid "Year:"
 msgstr ""
 
-#: src/madplug/fileinfo.c:476 src/tta/libtta.c:396 src/vorbis/fileinfo.c:641
+#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638
 #: src/wavpack/ui.cxx:232
 msgid "Track number:"
 msgstr "Parça numarası:"
 
-#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:539 src/tta/libtta.c:408
-#: src/vorbis/fileinfo.c:653 src/wavpack/ui.cxx:246
+#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388
+#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246
 msgid "Genre:"
 msgstr "Tür:"
 
@@ -3038,7 +3163,7 @@
 msgid "Unknown"
 msgstr "(bilinmeyen)"
 
-#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
+#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411
 #: src/wavpack/ui.cxx:407
 #, c-format
 msgid "File Info - %s"
@@ -3054,7 +3179,7 @@
 msgid "VBR (avg. %d kbps)"
 msgstr ""
 
-#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:962
+#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -3099,7 +3224,7 @@
 msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
 msgstr ""
 
-#: src/madplug/plugin.c:579
+#: src/madplug/plugin.c:578
 #, c-format
 msgid ""
 "Audacious MPEG Audio Plugin\n"
@@ -3117,17 +3242,17 @@
 "    Samuel Krempp"
 msgstr ""
 
-#: src/madplug/plugin.c:595
+#: src/madplug/plugin.c:594
 #, fuzzy
 msgid "About MPEG Audio Plugin"
 msgstr "MPEG Ses Eklentisi"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 #, fuzzy
 msgid "About Metronom"
 msgstr "Hakkında"
 
-#: src/metronom/metronom.c:87
+#: src/metronom/metronom.c:88
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3136,169 +3261,173 @@
 "or   tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:199 src/metronom/metronom.c:263
+#: src/metronom/metronom.c:198 src/metronom/metronom.c:262
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Ton Oluşturucu: "
 
-#: src/metronom/metronom.c:201 src/metronom/metronom.c:265
+#: src/metronom/metronom.c:200 src/metronom/metronom.c:264
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:117
+#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9
 #, fuzzy
 msgid "ModPlug Configuration"
 msgstr "Flac Yapılandırması"
 
-#: src/modplug/gui/interface.cxx:165 src/timidity/src/interface.c:142
+#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73
+#: src/timidity/interface.c:140
 msgid "16 bit"
 msgstr "16 bit"
 
-#: src/modplug/gui/interface.cxx:173 src/timidity/src/interface.c:134
+#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92
+#: src/timidity/interface.c:132
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/modplug/gui/interface.cxx:203
+#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178
 msgid "Mono (downmix)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:218 src/timidity/src/interface.c:76
-msgid "Sampling Rate"
-msgstr "Örnekleme Oranı"
-
-#: src/modplug/gui/interface.cxx:232
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:240
+#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297
+msgid "Spline (good quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317
+msgid "8-tap Fir (extremely high quality)"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384
 #, fuzzy
 msgid "44 kHz"
 msgstr "44100 Hz"
 
-#: src/modplug/gui/interface.cxx:248
+#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403
 #, fuzzy
 msgid "22 kHz"
 msgstr "22000 Hz"
 
-#: src/modplug/gui/interface.cxx:256
+#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423
 #, fuzzy
 msgid "11 kHz"
 msgstr "11000 Hz"
 
-#: src/modplug/gui/interface.cxx:278
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:294
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:302
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:346
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:353
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:368
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:376
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:384
-#, fuzzy
-msgid "Reverb"
-msgstr "Derinlik"
-
-#: src/modplug/gui/interface.cxx:398 src/modplug/gui/interface.cxx:470
-#: src/modplug/gui/interface.cxx:542 src/modplug/gui/interface.cxx:628
+#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444
+#: src/timidity/interface.c:74
+msgid "Sampling Rate"
+msgstr "Örnekleme Oranı"
+
+#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400
+#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719
+#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089
 #, fuzzy
 msgid "Enable"
 msgstr "Tetikleyici Aktif"
 
-#: src/modplug/gui/interface.cxx:438 src/modplug/gui/interface.cxx:582
+#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495
+#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977
 #, fuzzy
 msgid "Depth"
 msgstr "Düet"
 
-#: src/modplug/gui/interface.cxx:447 src/modplug/gui/interface.cxx:591
+#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503
+#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005
 #, fuzzy
 msgid "Delay"
 msgstr "Gecikme: (ms )"
 
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:510
+#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672
+#, fuzzy
+msgid "Reverb"
+msgstr "Derinlik"
+
+#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786
 #, fuzzy
 msgid "Amount"
 msgstr "Hakkında"
 
-#: src/modplug/gui/interface.cxx:519
+#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814
 #, fuzzy
 msgid "Range"
 msgstr "Dikdörtgen"
 
-#: src/modplug/gui/interface.cxx:528
+#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042
 #, fuzzy
 msgid "Surround"
 msgstr "Çevresel Yankı"
 
-#: src/modplug/gui/interface.cxx:600
+#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163
+msgid ""
+"Note:  Setting the preamp\n"
+"too high may cause clipping\n"
+"(annoying clicks and pops)!"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192
 #, fuzzy
 msgid "Preamp"
 msgstr "Ön anfi:"
 
-#: src/modplug/gui/interface.cxx:614
-msgid ""
-"Note:  Setting the preamp too high may cause\n"
-"clipping / distortion!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:649
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:663
+#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235
+msgid "Effects"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287
+msgid "Use Filename as Song Title"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306
+msgid "Fast Playlist Info"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338
+msgid "Noise Reduction"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357
+msgid "Play Amiga MOD"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430
 msgid "Don't loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:678
+#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455
 msgid "Loop"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:694
+#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493
 msgid "time(s)"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:701
+#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526
 msgid "Loop forever"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:709
-msgid "Effects"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:793
+#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547
+msgid "Looping"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668
 #, fuzzy
 msgid "MOD Info"
 msgstr "CD Bilgisi"
 
-#: src/modplug/gui/interface.cxx:817
+#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710
 msgid ""
 "Filename:\n"
 "Title:\n"
@@ -3312,25 +3441,39 @@
 "Channels:"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:866
+#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744
+msgid ""
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---\n"
+"---"
+msgstr ""
+
+#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849
 #, fuzzy
 msgid "Samples"
 msgstr "Salsa"
 
-#: src/modplug/gui/interface.cxx:899
+#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914
 #, fuzzy
 msgid "Instruments"
 msgstr "Enstrümantal"
 
-#: src/modplug/gui/interface.cxx:932
+#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971
 msgid "Message"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:43
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
 #: src/modplug/gui/main.cxx:44
+msgid "Modplug Input Plugin for Audacious ver"
+msgstr ""
+
+#: src/modplug/gui/main.cxx:45
 msgid ""
 "\n"
 "Modplug sound engine written by Olivier Lapicque.\n"
@@ -3340,27 +3483,22 @@
 "Ported to BMP by Theofilos Intzoglou."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:45
+#: src/modplug/gui/main.cxx:46
 #, fuzzy
 msgid "About Modplug"
 msgstr "Yankı (Eko) Eklentisi Hakkında"
 
-#: src/modplug/gui/support.cxx:118 src/sid/xs_glade.c:90
-#: src/sid/xs_glade.c:114
+#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "MIDI dosyası yüklenemedi"
 
-#: src/modplug/gui/support.cxx:127
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
-#: src/musepack/libmpc.cxx:145
+#: src/musepack/libmpc.cxx:146
 msgid "Musepack Decoder Plugin 1.2"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:146
+#: src/musepack/libmpc.cxx:147
 msgid ""
 "Plugin code by\n"
 "Benoit Amiaux\n"
@@ -3370,144 +3508,144 @@
 "Get latest version at http://musepack.net\n"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:147
+#: src/musepack/libmpc.cxx:148
 msgid "Nevermind"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:165
+#: src/musepack/libmpc.cxx:166
 #, fuzzy
 msgid "Musepack Decoder Configuration"
 msgstr "Disk Yazıcı Ayarları"
 
-#: src/musepack/libmpc.cxx:175
+#: src/musepack/libmpc.cxx:176
 #, fuzzy
 msgid "General Settings"
 msgstr "Karıştırıcı Ayarları:"
 
-#: src/musepack/libmpc.cxx:182 src/wavpack/ui.cxx:490
+#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490
 msgid "Enable Dynamic Bitrate Display"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:186 src/wavpack/ui.cxx:496
+#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496
 #, fuzzy
 msgid "Plugin"
 msgstr "LIRC Eklentisi"
 
-#: src/musepack/libmpc.cxx:189
+#: src/musepack/libmpc.cxx:190
 #, fuzzy
 msgid "ReplayGain Settings"
 msgstr "ReplayGain Ayarları:"
 
-#: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
+#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170
 #: src/wavpack/ui.cxx:508
 msgid "Enable Clipping Prevention"
 msgstr " Çatlama Korumasını Etkinleştir"
 
-#: src/musepack/libmpc.cxx:201 src/vorbis/configure.c:177
+#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175
 #: src/wavpack/ui.cxx:513
 msgid "Enable ReplayGain"
 msgstr "ReplayGain Etkinleştir"
 
-#: src/musepack/libmpc.cxx:206
+#: src/musepack/libmpc.cxx:207
 #, fuzzy
 msgid "ReplayGain Type"
 msgstr "ReplayGain Türü:"
 
-#: src/musepack/libmpc.cxx:214
+#: src/musepack/libmpc.cxx:215
 #, fuzzy
 msgid "Use Track Gain"
 msgstr "Parçada Gain/Peak kullan"
 
-#: src/musepack/libmpc.cxx:218
+#: src/musepack/libmpc.cxx:219
 #, fuzzy
 msgid "Use Album Gain"
 msgstr "Albümde Gain/Peak kullan"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:2994
-#: src/sid/xs_interface.c:1495 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144
+#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: src/musepack/libmpc.cxx:505
+#: src/musepack/libmpc.cxx:506
 msgid "Musepack Tag"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:534
+#: src/musepack/libmpc.cxx:535
 #, fuzzy
 msgid "Track:"
 msgstr "Parça ses yüksekliği:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
-#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Kaydet"
 
-#: src/musepack/libmpc.cxx:553 src/wavpack/ui.cxx:271
+#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271
 msgid "Remove Tag"
 msgstr "Etiketi kaldır"
 
-#: src/musepack/libmpc.cxx:561
+#: src/musepack/libmpc.cxx:562
 msgid "Musepack Info"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:594
-#, c-format
-msgid "Streamversion %d"
-msgstr ""
-
 #: src/musepack/libmpc.cxx:595
 #, c-format
-msgid "Encoder: %s"
+msgid "Streamversion %d"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:596
 #, c-format
-msgid "Profile: %s"
+msgid "Encoder: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:597
 #, c-format
-msgid "Average bitrate: %6.1f kbps"
+msgid "Profile: %s"
 msgstr ""
 
 #: src/musepack/libmpc.cxx:598
 #, c-format
-msgid "Samplerate: %d Hz"
-msgstr "Örnekleme oranı: %d Hz"
+msgid "Average bitrate: %6.1f kbps"
+msgstr ""
 
 #: src/musepack/libmpc.cxx:599
 #, c-format
+msgid "Samplerate: %d Hz"
+msgstr "Örnekleme oranı: %d Hz"
+
+#: src/musepack/libmpc.cxx:600
+#, c-format
 msgid "Channels: %d"
 msgstr "Kanallar: %d"
 
-#: src/musepack/libmpc.cxx:600
+#: src/musepack/libmpc.cxx:601
 #, fuzzy, c-format
 msgid "Length: %d:\\%.2d"
 msgstr ""
 "Örnekler: %llu\n"
 "Uzunluk: %d:%.2d"
 
-#: src/musepack/libmpc.cxx:601
+#: src/musepack/libmpc.cxx:602
 #, fuzzy, c-format
 msgid "File size: %d Bytes"
 msgstr "Dosya boyutu: %ld B"
 
-#: src/musepack/libmpc.cxx:602
+#: src/musepack/libmpc.cxx:603
 #, fuzzy, c-format
 msgid "Track Peak: %5u"
 msgstr "Parça doruğu:"
 
-#: src/musepack/libmpc.cxx:603
+#: src/musepack/libmpc.cxx:604
 #, fuzzy, c-format
 msgid "Track Gain: %-+2.2f dB"
 msgstr "Parçanın desibel olarak ortalamasını yükselt: %+2.2f dB"
 
-#: src/musepack/libmpc.cxx:604
+#: src/musepack/libmpc.cxx:605
 #, fuzzy, c-format
 msgid "Album Peak: %5u"
 msgstr "Albüm doruğu:"
 
-#: src/musepack/libmpc.cxx:605
+#: src/musepack/libmpc.cxx:606
 #, fuzzy, c-format
 msgid "Album Gain: %-+5.2f dB"
 msgstr "Tüm albümün desibel olarak ortalamasını yükselt: %+2.2f dB"
@@ -3585,24 +3723,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/OSS4/configure.c:120 src/OSS/configure.c:152
+#: src/OSS4/configure.c:120 src/OSS/configure.c:151
 #, c-format
 msgid "Default (%s)"
 msgstr "Varsayılan (%s)"
 
-#: src/OSS4/configure.c:170 src/OSS/configure.c:202
+#: src/OSS4/configure.c:170 src/OSS/configure.c:201
 msgid "OSS Driver configuration"
 msgstr "OSS Sürücüsü ayarları"
 
-#: src/OSS4/configure.c:208 src/OSS/configure.c:240 src/OSS/configure.c:281
+#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280
 msgid "Use alternate device:"
 msgstr "Farklı aygıt kullan:"
 
-#: src/OSS4/configure.c:230 src/OSS/configure.c:303 src/sun/configure.c:248
+#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248
 msgid "Devices"
 msgstr "Aygıtlar"
 
-#: src/OSS4/configure.c:272 src/OSS/configure.c:344
+#: src/OSS4/configure.c:272 src/OSS/configure.c:343
 msgid "Mixer Settings:"
 msgstr "Karıştırıcı Ayarları:"
 
@@ -3610,7 +3748,7 @@
 msgid "Save VMIX volume between sessions"
 msgstr ""
 
-#: src/OSS4/configure.c:284 src/OSS/configure.c:356 src/sun/configure.c:394
+#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394
 msgid "Mixer"
 msgstr "Karıştırıcı"
 
@@ -3656,16 +3794,16 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/OSS/configure.c:350
+#: src/OSS/configure.c:349
 msgid "Volume controls Master not PCM"
 msgstr "Ses ayarı PCM değil, ana kanalı ayarlasın"
 
-#: src/pulse_audio/pulse_audio.c:678
+#: src/pulse_audio/pulse_audio.c:676
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "CoreAudio Çıkış Eklentisi"
 
-#: src/pulse_audio/pulse_audio.c:679
+#: src/pulse_audio/pulse_audio.c:677
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3704,27 +3842,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/scrobbler/configure.c:100
+#: src/scrobbler/configure.c:99
 msgid "<b>Services</b>"
 msgstr "<b>Hizmetler</b>"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:162
+#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161
 msgid "Username:"
 msgstr "Kullanıcı adı:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:168
+#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167
 msgid "Password:"
 msgstr "Şifre:"
 
-#: src/scrobbler/configure.c:146
+#: src/scrobbler/configure.c:145
 msgid "<b>Last.FM</b>"
 msgstr "<b>Last.FM</b>"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:185
 msgid "<b>Gerpok</b>"
 msgstr "<b>Gerpok</b>"
 
-#: src/scrobbler/gtkstuff.c:20
+#: src/scrobbler/gtkstuff.c:21
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3732,11 +3870,11 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:22
+#: src/scrobbler/gtkstuff.c:23
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler Eklentisi Hakkında"
 
-#: src/scrobbler/gtkstuff.c:35
+#: src/scrobbler/gtkstuff.c:36
 #, c-format
 msgid ""
 "There has been an error that may require your attention.\n"
@@ -3746,7 +3884,7 @@
 "%s\n"
 msgstr ""
 
-#: src/scrobbler/gtkstuff.c:41
+#: src/scrobbler/gtkstuff.c:42
 #, fuzzy
 msgid "Scrobbler Error"
 msgstr "Scrobbler Eklentisi"
@@ -3759,134 +3897,134 @@
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:414
+#: src/sid/xmms-sid.c:347
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:421
+#: src/sid/xmms-sid.c:355
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:436
+#: src/sid/xmms-sid.c:371
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:446
+#: src/sid/xmms-sid.c:382
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:491
+#: src/sid/xmms-sid.c:432
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221
 #, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Audacious OSD - yapılandırması"
 
-#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bit"
 
-#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bit"
 
-#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271
 #, fuzzy
 msgid "Resolution:"
 msgstr "Çözünürlük"
 
-#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
-#: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309
+#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921
 msgid "Channels:"
 msgstr "Kanallar:"
 
-#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Örnekleme oranı:"
 
-#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
 "itself."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450
 msgid ""
 "NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
 "that differ from PAL). It is mainly used in United States, Japan and certain "
 "other countries."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Çalma hızı"
 
-#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "SID-chip model. Otherwise the preferred SID model is determined from the "
 "file (if PSIDv2NG type) or if not available, this setting is used."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471
 #, fuzzy
 msgid "Force model"
 msgstr "Çalma modu"
 
-#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481
 msgid ""
 "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
 "in few ways, having much fuller filter (which, due to design error, is never "
@@ -3894,92 +4032,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492
 #, fuzzy
 msgid "SID model:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transpoze:"
 
-#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
 "frame-exact. The result is lower CPU usage, but worse accuracy."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608
 msgid ""
 "reSID is the software SID-chip simulator based on SID reverse-engineering, "
 "created by Dag Lem. It is probably the closest thing to real SID available "
 "as software-only emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616
 msgid ""
 "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
 "real SID-chip. Software can be used to control the HardSID and combined with "
@@ -3988,49 +4126,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Örnekleme oranı:"
 
-#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688
 msgid ""
 "This option enables emulation of SID filter. The filter is an essential part "
 "of SID's sound capacity, but accurate emulation of it may require quite much "
@@ -4038,295 +4176,338 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804
 #, fuzzy
 msgid "Export"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812
 msgid "Use"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828
 #, fuzzy
 msgid "Import"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836
 #, fuzzy
 msgid "Delete"
 msgstr "Varsayılan"
 
-#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Dosya boytu:"
 
-#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Normal hızda çal"
 
 #: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133
-#: src/sid/xmms-sid.glade:2482 src/sid/xs_interface.c:887
-#: src/sid/xs_interface.c:941 src/sid/xs_interface.c:1051
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895
+#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109
 #, fuzzy
 msgid "Playtime:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997
 #, fuzzy
 msgid "DB-file:"
 msgstr "Aygıt dosyası:"
 
-#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021
 #, fuzzy
 msgid "Songlength"
 msgstr "Varsayılan şarkı uzunluğu:"
 
-#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043
+msgid ""
+"By enabling this option you can specify a custom Tuplez formatting string "
+"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
+"below."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039
+#, fuzzy
+msgid "Override generic Tuplez format string"
+msgstr "Genel başlıkları geçersiz kıl"
+
+#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054
+msgid "Tuplez format string for SID-files"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057
+msgid "Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065
+#, fuzzy
+msgid "Song title format:"
+msgstr "Başlık biçimi:"
+
+#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096
+msgid ""
+"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
+"only the default sub-tune will be added."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092
 msgid "Add sub-tunes to playlist"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
+#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102
+msgid "Only add sub-tunes that have a duration of at least specified time."
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098
+msgid "Only tunes with specified minimum duration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129
 #, fuzzy
 msgid "Sub-tune handling:"
 msgstr "Ses kontrolü:"
 
-#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
+#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150
 msgid ""
 "If this option is enabled (and the database & HVSC settings below are "
 "correctly set), Audacious-SID will use and display additional information "
 "from STIL database when HVSC SIDs are played."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
+#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
+#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157
 #, fuzzy
 msgid "STIL file:"
 msgstr "Arayüz Dosyası:"
 
-#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
+#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
+#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
+#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
+#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
+#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
+#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
+#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
+#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
+#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD "
 
-#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
+#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
+#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
-#: src/vorbis/fileinfo.c:723
+#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588
+#: src/vorbis/fileinfo.c:720
 msgid "Copyright:"
 msgstr "Telif Hakkı:"
 
-#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
+#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Song Information:"
 msgstr "Bilgi"
 
-#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
+#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
+#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701
 #, fuzzy
 msgid "Duration:"
 msgstr "Dekorasyon"
 
-#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
+#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Bilgi"
 
-#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
+#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837
 msgid "Select STIL-database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
+#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919
 msgid "Select SIDPlay2 filters file for importing"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960
 msgid "Select SIDPlay2 filters file for exporting"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
-#: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
+#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953
+#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021
 #, fuzzy
 msgid "Confirm selected action"
 msgstr "Backend bölümü"
 
-#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038
 #, fuzzy
 msgid "Yes"
 msgstr "evet"
 
-#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044
 #, fuzzy
 msgid "No"
 msgstr "Hiçbiri"
 
-#: src/sid/xs_fileinfo.c:238
+#: src/sid/xs_about.c:84 src/wma/wma.c:130
+#, c-format
+msgid "About %s"
+msgstr "%s Hakkında"
+
+#: src/sid/xs_config.c:580
+msgid "Allocation of sid2FilterPresets structure failed!\n"
+msgstr ""
+
+#: src/sid/xs_config.c:908
+msgid "Warning: Could not set filter curve widget points!\n"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:232
 #, fuzzy
 msgid "General info"
 msgstr "Genel"
 
-#: src/sid/xs_fileinfo.c:248
+#: src/sid/xs_fileinfo.c:247
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:259
-#, c-format
-msgid "Tune #%i"
-msgstr ""
-
 #: src/sid/xs_length.c:113
 msgid "Error allocating new node. Fatal error.\n"
 msgstr ""
@@ -4469,6 +4650,21 @@
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
+#: src/sid/xs_slsup.c:217
+#, c-format
+msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:224
+#, c-format
+msgid "Could not allocate sidFilename ('%s')\n"
+msgstr ""
+
+#: src/sid/xs_slsup.c:233
+#, c-format
+msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
+msgstr ""
+
 #: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
@@ -4482,66 +4678,66 @@
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:163
+#: src/sndstretch/sndstretch_xmms.c:159
 #, fuzzy
 msgid "About SndStretch"
 msgstr "OSS Sürücüsü Hakkında"
 
-#: src/sndstretch/sndstretch_xmms.c:323
+#: src/sndstretch/sndstretch_xmms.c:319
 #, fuzzy
 msgid "Volume corr."
 msgstr "Ses kontrolü:"
 
-#: src/sndstretch/sndstretch_xmms.c:324
+#: src/sndstretch/sndstretch_xmms.c:320
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:378
+#: src/sndstretch/sndstretch_xmms.c:374
 #, fuzzy
 msgid "Speed"
 msgstr "Konuşma"
 
-#: src/sndstretch/sndstretch_xmms.c:379
+#: src/sndstretch/sndstretch_xmms.c:375
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:380
+#: src/sndstretch/sndstretch_xmms.c:376
 #, fuzzy
 msgid "Scale"
 msgstr "Kaydet"
 
-#: src/sndstretch/sndstretch_xmms.c:400
+#: src/sndstretch/sndstretch_xmms.c:396
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Sun sürücüsü yapılandırması"
 
-#: src/song_change/song_change.c:349
+#: src/song_change/song_change.c:316
 msgid "Commands"
 msgstr "Komutlar"
 
-#: src/song_change/song_change.c:356
+#: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
 msgstr "Audacious yeni bir şarkı başlattığında çalışacak komut."
 
-#: src/song_change/song_change.c:365 src/song_change/song_change.c:387
-#: src/song_change/song_change.c:408 src/song_change/song_change.c:429
+#: src/song_change/song_change.c:332 src/song_change/song_change.c:354
+#: src/song_change/song_change.c:375 src/song_change/song_change.c:396
 msgid "Command:"
 msgstr "Komut:"
 
-#: src/song_change/song_change.c:379
+#: src/song_change/song_change.c:346
 msgid "Command to run toward the end of a song."
 msgstr "Bir şarkının sonuna doğru çalışacak komut."
 
-#: src/song_change/song_change.c:399
+#: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Audacious çalma listesinin sonuna ulaştığında çalıştırılacak komut."
 
-#: src/song_change/song_change.c:420
+#: src/song_change/song_change.c:387
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:441
+#: src/song_change/song_change.c:408
 #, c-format
 msgid ""
 "You can use the following format strings which\n"
@@ -4570,7 +4766,7 @@
 "%%t: Çalma listesi durumu (%%02d)\n"
 "%%p: Şu an oynatılan (1 or 0)"
 
-#: src/song_change/song_change.c:466
+#: src/song_change/song_change.c:433
 msgid ""
 "<span size='small'>Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk.</span>"
@@ -4578,7 +4774,7 @@
 "<span size='small'>Kabuğa yollanan parametreler tırnak içinde belirtilmeli. "
 "Aksi takdirde güvenlik sorunu yaratır. </span>"
 
-#: src/spectrum/spectrum.c:96
+#: src/spectrum/spectrum.c:90
 msgid "Spectrum Analyzer"
 msgstr ""
 
@@ -4640,7 +4836,7 @@
 msgid "Change playing song"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:29
+#: src/stereo_plugin/stereo.c:26
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4650,15 +4846,15 @@
 "\n"
 "Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:55
+#: src/stereo_plugin/stereo.c:52
 msgid "About Extra Stereo Plugin"
 msgstr "Ekstra Stereo Eklentisi Hakkında"
 
-#: src/stereo_plugin/stereo.c:96
+#: src/stereo_plugin/stereo.c:93
 msgid "Configure Extra Stereo"
 msgstr "Ekstra Stereo Eklentisini Yapılandır"
 
-#: src/stereo_plugin/stereo.c:98
+#: src/stereo_plugin/stereo.c:95
 msgid "Effect intensity:"
 msgstr "Efekt yoğunluğu:"
 
@@ -4694,31 +4890,31 @@
 msgid "Sun driver configuration"
 msgstr "Sun sürücüsü yapılandırması"
 
-#: src/timidity/src/interface.c:56
+#: src/timidity/interface.c:54
 msgid "TiMidity Configuration"
 msgstr "TiMidity Yapılandırması"
 
-#: src/timidity/src/interface.c:93
+#: src/timidity/interface.c:91
 msgid "11000 Hz"
 msgstr "11000 Hz"
 
-#: src/timidity/src/interface.c:101
+#: src/timidity/interface.c:99
 msgid "22000 Hz"
 msgstr "22000 Hz"
 
-#: src/timidity/src/interface.c:109
+#: src/timidity/interface.c:107
 msgid "44100 Hz"
 msgstr "44100 Hz"
 
-#: src/timidity/src/interface.c:117
+#: src/timidity/interface.c:115
 msgid "Sample Width"
 msgstr "Örnekleme Genişliği"
 
-#: src/timidity/src/interface.c:183
+#: src/timidity/interface.c:181
 msgid "TiMidity Configuration File"
 msgstr "TiMidity Yapılandırma Dosyası"
 
-#: src/timidity/src/xmms-timidity.c:134
+#: src/timidity/xmms-timidity.c:115
 msgid ""
 "TiMidity Plugin\n"
 "http://libtimidity.sourceforge.net\n"
@@ -4728,12 +4924,12 @@
 "http://libtimidity.sourceforge.net\n"
 "Konstantin Korikov"
 
-#: src/timidity/src/xmms-timidity.c:135
+#: src/timidity/xmms-timidity.c:116
 #, c-format
 msgid "TiMidity Plugin %s"
 msgstr "TiMidity Eklentisi %s"
 
-#: src/timidity/src/xmms-timidity.c:352
+#: src/timidity/xmms-timidity.c:333
 msgid "Couldn't load MIDI file"
 msgstr "MIDI dosyası yüklenemedi"
 
@@ -4755,695 +4951,695 @@
 "Kullanmak için bir URL ekleyin: tone://frequency1;frequency2;frequency3;...\n"
 "ör: 2000Hz ton ve 2005Hz ton çalmak için tone://2000;2005"
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:170
+#: src/tonegen/tonegen.c:168
 msgid "Tone Generator: "
 msgstr "Ton Oluşturucu: "
 
-#: src/tta/libtta.c:148
+#: src/tta/libtta.c:128
 msgid "Can't open file\n"
 msgstr ""
 
-#: src/tta/libtta.c:151
+#: src/tta/libtta.c:131
 msgid "Not supported file format\n"
 msgstr ""
 
-#: src/tta/libtta.c:154
+#: src/tta/libtta.c:134
 msgid "File is corrupted\n"
 msgstr ""
 
-#: src/tta/libtta.c:157
+#: src/tta/libtta.c:137
 msgid "Can't read from file\n"
 msgstr ""
 
-#: src/tta/libtta.c:160
+#: src/tta/libtta.c:140
 msgid "Insufficient memory available\n"
 msgstr ""
 
-#: src/tta/libtta.c:163
+#: src/tta/libtta.c:143
 #, fuzzy
 msgid "Output plugin error\n"
 msgstr "Null Çıkış eklentisi"
 
-#: src/tta/libtta.c:166
+#: src/tta/libtta.c:146
 #, fuzzy
 msgid "Unknown error\n"
 msgstr "Bilinmeyen ses kartı"
 
-#: src/tta/libtta.c:170
+#: src/tta/libtta.c:150
 msgid "TTA Decoder Error"
 msgstr ""
 
-#: src/tta/libtta.c:279
+#: src/tta/libtta.c:259
 #, fuzzy
 msgid "TTA input plugin "
 msgstr "Null Çıkış eklentisi"
 
-#: src/tta/libtta.c:280
+#: src/tta/libtta.c:260
 msgid ""
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
 
-#: src/tta/libtta.c:283
+#: src/tta/libtta.c:263
 #, fuzzy
 msgid "About True Audio Plugin"
 msgstr "OGG Vorbis Ses Eklentisi Hakkında"
 
-#: src/tta/libtta.c:334
+#: src/tta/libtta.c:314
 #, fuzzy
 msgid "ID3 Tag:"
 msgstr "ID3 Etiketi"
 
-#: src/vorbis/configure.c:117
+#: src/vorbis/configure.c:115
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis Ses Eklentisi Yapılandırması"
 
-#: src/vorbis/configure.c:129
+#: src/vorbis/configure.c:127
 msgid "Ogg Vorbis Tags:"
 msgstr "Ogg Vorbis Etiketleri:"
 
-#: src/vorbis/configure.c:150
+#: src/vorbis/configure.c:148
 msgid "Title format:"
 msgstr "Başlık biçimi:"
 
-#: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
+#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
 msgstr "ReplayGain Ayarları:"
 
-#: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
+#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
 msgstr "ReplayGain Türü:"
 
-#: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
+#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
 msgstr "Parçada Gain/Peak kullan"
 
-#: src/vorbis/configure.c:203 src/wavpack/ui.cxx:537
+#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537
 msgid "use Album Gain/Peak"
 msgstr "Albümde Gain/Peak kullan"
 
-#: src/vorbis/configure.c:215
+#: src/vorbis/configure.c:213
 msgid "Enable 6dB Boost + Hard Limiting"
 msgstr "6dB artırma (kompresör) + sınırlayıcı (limitır) Aktif"
 
-#: src/vorbis/fileinfo.c:83
+#: src/vorbis/fileinfo.c:80
 msgid "Blues"
 msgstr "Blues"
 
+#: src/vorbis/fileinfo.c:80
+msgid "Classic Rock"
+msgstr "Klasik Rock"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Country"
+msgstr "Country"
+
+#: src/vorbis/fileinfo.c:80
+msgid "Dance"
+msgstr "Dans"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Disco"
+msgstr "Disko"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Funk"
+msgstr "Funk"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/vorbis/fileinfo.c:81
+msgid "Hip-Hop"
+msgstr "Hip-Hop"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Metal"
+msgstr "Metal"
+
+#: src/vorbis/fileinfo.c:82
+msgid "New Age"
+msgstr "New Age"
+
+#: src/vorbis/fileinfo.c:82
+msgid "Oldies"
+msgstr "Eskiler"
+
 #: src/vorbis/fileinfo.c:83
-msgid "Classic Rock"
-msgstr "Klasik Rock"
+msgid "Other"
+msgstr "Diğer"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Pop"
+msgstr "Pop"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Country"
-msgstr "Country"
+msgid "R&B"
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:83
-msgid "Dance"
-msgstr "Dans"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Disco"
-msgstr "Disko"
+msgid "Rap"
+msgstr "Rap"
+
+#: src/vorbis/fileinfo.c:83
+msgid "Reggae"
+msgstr "Reggae"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Funk"
-msgstr "Funk"
-
-#: src/vorbis/fileinfo.c:84
-msgid "Grunge"
-msgstr "Grunge"
+msgid "Rock"
+msgstr "Rock"
 
 #: src/vorbis/fileinfo.c:84
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Jazz"
-msgstr "Jazz"
-
-#: src/vorbis/fileinfo.c:85
-msgid "Metal"
-msgstr "Metal"
-
-#: src/vorbis/fileinfo.c:85
-msgid "New Age"
-msgstr "New Age"
+msgid "Techno"
+msgstr "Tekno"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Industrial"
+msgstr "Endüstriyel"
+
+#: src/vorbis/fileinfo.c:84
+msgid "Alternative"
+msgstr "Alternatif"
 
 #: src/vorbis/fileinfo.c:85
-msgid "Oldies"
-msgstr "Eskiler"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Other"
-msgstr "Diğer"
-
-#: src/vorbis/fileinfo.c:86
-msgid "Pop"
-msgstr "Pop"
-
-#: src/vorbis/fileinfo.c:86
-msgid "R&B"
-msgstr "R&B"
+msgid "Ska"
+msgstr "Ska"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Pranks"
+msgstr "Pranks"
+
+#: src/vorbis/fileinfo.c:85
+msgid "Soundtrack"
+msgstr "Soundtrack"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Rap"
-msgstr "Rap"
+msgid "Euro-Techno"
+msgstr "Euro-Techno"
 
 #: src/vorbis/fileinfo.c:86
-msgid "Reggae"
-msgstr "Reggae"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Rock"
-msgstr "Rock"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Techno"
-msgstr "Tekno"
-
-#: src/vorbis/fileinfo.c:87
-msgid "Industrial"
-msgstr "Endüstriyel"
+msgid "Ambient"
+msgstr "Ambiyans"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Trip-Hop"
+msgstr "Trip-Hop"
+
+#: src/vorbis/fileinfo.c:86
+msgid "Vocal"
+msgstr "Vokal"
 
 #: src/vorbis/fileinfo.c:87
-msgid "Alternative"
-msgstr "Alternatif"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Ska"
-msgstr "Ska"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Death Metal"
-msgstr "Death Metal"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Pranks"
-msgstr "Pranks"
-
-#: src/vorbis/fileinfo.c:88
-msgid "Soundtrack"
-msgstr "Soundtrack"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Ambient"
-msgstr "Ambiyans"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
-
-#: src/vorbis/fileinfo.c:89
-msgid "Vocal"
-msgstr "Vokal"
-
-#: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Fusion"
 msgstr "Fusion"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Trance"
 msgstr "Trance"
 
-#: src/vorbis/fileinfo.c:90
+#: src/vorbis/fileinfo.c:87
 msgid "Classical"
 msgstr "Klasik"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Instrumental"
 msgstr "Enstrümantal"
 
-#: src/vorbis/fileinfo.c:91
+#: src/vorbis/fileinfo.c:88
 msgid "Acid"
 msgstr "Asit"
 
+#: src/vorbis/fileinfo.c:88
+msgid "House"
+msgstr "House"
+
+#: src/vorbis/fileinfo.c:88
+msgid "Game"
+msgstr "Oyun"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Sound Clip"
+msgstr "Ses Klibi"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/vorbis/fileinfo.c:89
+msgid "Noise"
+msgstr "Gürültü"
+
+#: src/vorbis/fileinfo.c:89
+msgid "AlternRock"
+msgstr "Alternatif Rock"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Bass"
+msgstr "Bas"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Soul"
+msgstr "Soul"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Punk"
+msgstr "Punk"
+
+#: src/vorbis/fileinfo.c:90
+msgid "Space"
+msgstr "Uzay"
+
 #: src/vorbis/fileinfo.c:91
-msgid "House"
-msgstr "House"
+msgid "Meditative"
+msgstr "Meditasyon"
 
 #: src/vorbis/fileinfo.c:91
-msgid "Game"
-msgstr "Oyun"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Sound Clip"
-msgstr "Ses Klibi"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Gospel"
-msgstr "Gospel"
-
-#: src/vorbis/fileinfo.c:92
-msgid "Noise"
-msgstr "Gürültü"
+msgid "Instrumental Pop"
+msgstr "Enstrümantal Pop"
 
 #: src/vorbis/fileinfo.c:92
-msgid "AlternRock"
-msgstr "Alternatif Rock"
+msgid "Instrumental Rock"
+msgstr "Enstrümantal Rock"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Ethnic"
+msgstr "Etnik"
+
+#: src/vorbis/fileinfo.c:92
+msgid "Gothic"
+msgstr "Gotik"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Bass"
-msgstr "Bas"
+msgid "Darkwave"
+msgstr "Darkwave"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Soul"
-msgstr "Soul"
-
-#: src/vorbis/fileinfo.c:93
-msgid "Punk"
-msgstr "Punk"
+msgid "Techno-Industrial"
+msgstr "Tekno-Endüstriyel"
 
 #: src/vorbis/fileinfo.c:93
-msgid "Space"
-msgstr "Uzay"
+msgid "Electronic"
+msgstr "Elektronik"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Meditative"
-msgstr "Meditasyon"
+msgid "Pop-Folk"
+msgstr "Pop-Folk"
+
+#: src/vorbis/fileinfo.c:94
+msgid "Eurodance"
+msgstr "Eurodance"
 
 #: src/vorbis/fileinfo.c:94
-msgid "Instrumental Pop"
-msgstr "Enstrümantal Pop"
+msgid "Dream"
+msgstr "Rüya"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Instrumental Rock"
-msgstr "Enstrümantal Rock"
+msgid "Southern Rock"
+msgstr "Southern Rock"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Ethnic"
-msgstr "Etnik"
+msgid "Comedy"
+msgstr "Komedi"
 
 #: src/vorbis/fileinfo.c:95
-msgid "Gothic"
-msgstr "Gotik"
+msgid "Cult"
+msgstr "Kült"
 
 #: src/vorbis/fileinfo.c:96
-msgid "Darkwave"
-msgstr "Darkwave"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Techno-Industrial"
-msgstr "Tekno-Endüstriyel"
-
-#: src/vorbis/fileinfo.c:96
-msgid "Electronic"
-msgstr "Elektronik"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Eurodance"
-msgstr "Eurodance"
-
-#: src/vorbis/fileinfo.c:97
-msgid "Dream"
-msgstr "Rüya"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Southern Rock"
-msgstr "Southern Rock"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Comedy"
-msgstr "Komedi"
-
-#: src/vorbis/fileinfo.c:98
-msgid "Cult"
-msgstr "Kült"
-
-#: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/vorbis/fileinfo.c:99
+#: src/vorbis/fileinfo.c:96
 msgid "Christian Rap"
 msgstr "Christian Rap"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Pop/Funk"
 msgstr "Pop/Funk"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/vorbis/fileinfo.c:100
+#: src/vorbis/fileinfo.c:97
 msgid "Native American"
 msgstr "Amerikan Folk"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "Cabaret"
 msgstr "Kabare"
 
-#: src/vorbis/fileinfo.c:101
+#: src/vorbis/fileinfo.c:98
 msgid "New Wave"
 msgstr "New Wave"
 
+#: src/vorbis/fileinfo.c:98
+msgid "Psychedelic"
+msgstr "Psychedelic"
+
+#: src/vorbis/fileinfo.c:98
+msgid "Rave"
+msgstr "Rave"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Showtunes"
+msgstr "Showtunes"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Trailer"
+msgstr "Trailer"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Lo-Fi"
+msgstr "Lo-Fi"
+
+#: src/vorbis/fileinfo.c:99
+msgid "Tribal"
+msgstr "Tribal"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Punk"
+msgstr "Acid Punk"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Polka"
+msgstr "Polka"
+
+#: src/vorbis/fileinfo.c:100
+msgid "Retro"
+msgstr "Retro"
+
 #: src/vorbis/fileinfo.c:101
-msgid "Psychedelic"
-msgstr "Psychedelic"
+msgid "Musical"
+msgstr "Müzikal"
 
 #: src/vorbis/fileinfo.c:101
-msgid "Rave"
-msgstr "Rave"
-
-#: src/vorbis/fileinfo.c:102
-msgid "Showtunes"
-msgstr "Showtunes"
+msgid "Rock & Roll"
+msgstr "Rock & Roll"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/vorbis/fileinfo.c:101
+msgid "Folk"
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Trailer"
-msgstr "Trailer"
+msgid "Folk/Rock"
+msgstr "Folk/Rock"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+msgid "National Folk"
+msgstr "Ulusal Folk"
 
 #: src/vorbis/fileinfo.c:102
-msgid "Tribal"
-msgstr "Tribal"
-
-#: src/vorbis/fileinfo.c:103
-msgid "Acid Punk"
-msgstr "Acid Punk"
+msgid "Swing"
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgid "Fast-Fusion"
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Polka"
-msgstr "Polka"
+msgid "Bebob"
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:103
-msgid "Retro"
-msgstr "Retro"
+msgid "Latin"
+msgstr "Latin"
+
+#: src/vorbis/fileinfo.c:103
+msgid "Revival"
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Musical"
-msgstr "Müzikal"
-
-#: src/vorbis/fileinfo.c:104
-msgid "Rock & Roll"
-msgstr "Rock & Roll"
+msgid "Celtic"
+msgstr "Kelt"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Hard Rock"
-msgstr "Hard Rock"
+msgid "Bluegrass"
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:104
-msgid "Folk"
-msgstr "Folk"
+msgid "Avantgarde"
+msgstr "Avantgarde"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
-
-#: src/vorbis/fileinfo.c:105
-msgid "National Folk"
-msgstr "Ulusal Folk"
+msgid "Gothic Rock"
+msgstr "Gothic Rock"
 
 #: src/vorbis/fileinfo.c:105
-msgid "Swing"
-msgstr "Swing"
+msgid "Progressive Rock"
+msgstr "Progressive Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+msgid "Psychedelic Rock"
+msgstr "Psychedelic Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Bebob"
-msgstr "Bebob"
+msgid "Symphonic Rock"
+msgstr "Senfonik Rock"
 
 #: src/vorbis/fileinfo.c:106
-msgid "Latin"
-msgstr "Latin"
-
-#: src/vorbis/fileinfo.c:106
-msgid "Revival"
-msgstr "Revival"
+msgid "Slow Rock"
+msgstr "Slow Rock"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Celtic"
-msgstr "Kelt"
+msgid "Big Band"
+msgstr "Big Band"
+
+#: src/vorbis/fileinfo.c:107
+msgid "Chorus"
+msgstr "Chorus"
 
 #: src/vorbis/fileinfo.c:107
-msgid "Bluegrass"
-msgstr "Bluegrass"
-
-#: src/vorbis/fileinfo.c:107
-msgid "Avantgarde"
-msgstr "Avantgarde"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Gothic Rock"
-msgstr "Gothic Rock"
-
-#: src/vorbis/fileinfo.c:108
-msgid "Progressive Rock"
-msgstr "Progressive Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Psychedelic Rock"
-msgstr "Psychedelic Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Symphonic Rock"
-msgstr "Senfonik Rock"
-
-#: src/vorbis/fileinfo.c:109
-msgid "Slow Rock"
-msgstr "Slow Rock"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Big Band"
-msgstr "Big Band"
-
-#: src/vorbis/fileinfo.c:110
-msgid "Chorus"
-msgstr "Chorus"
-
-#: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
 msgstr "Rahatlatıcı Tür"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Acoustic"
 msgstr "Akustik"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Humour"
 msgstr "Humour"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Speech"
 msgstr "Konuşma"
 
-#: src/vorbis/fileinfo.c:111
+#: src/vorbis/fileinfo.c:108
 msgid "Chanson"
 msgstr "Türkü"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Opera"
 msgstr "Opera"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Chamber Music"
 msgstr "Oda Müziği"
 
-#: src/vorbis/fileinfo.c:112
+#: src/vorbis/fileinfo.c:109
 msgid "Sonata"
 msgstr "Sonata"
 
+#: src/vorbis/fileinfo.c:109
+msgid "Symphony"
+msgstr "Senfoni"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Booty Bass"
+msgstr "Yoğun Bas"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Primus"
+msgstr "Primus"
+
+#: src/vorbis/fileinfo.c:110
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Satire"
+msgstr "Taşlama"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Club"
+msgstr "Club"
+
+#: src/vorbis/fileinfo.c:111
+msgid "Tango"
+msgstr "Tango"
+
 #: src/vorbis/fileinfo.c:112
-msgid "Symphony"
-msgstr "Senfoni"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Booty Bass"
-msgstr "Yoğun Bas"
-
-#: src/vorbis/fileinfo.c:113
-msgid "Primus"
-msgstr "Primus"
+msgid "Samba"
+msgstr "Samba"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Folklore"
+msgstr "Folklor"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Ballad"
+msgstr "Ballad"
+
+#: src/vorbis/fileinfo.c:112
+msgid "Power Ballad"
+msgstr "Power Ballad"
 
 #: src/vorbis/fileinfo.c:113
-msgid "Porn Groove"
-msgstr "Porn Groove"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Satire"
-msgstr "Taşlama"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Slow Jam"
-msgstr "Slow Jam"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Club"
-msgstr "Club"
-
-#: src/vorbis/fileinfo.c:114
-msgid "Tango"
-msgstr "Tango"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Samba"
-msgstr "Samba"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Folklore"
-msgstr "Folklor"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Ballad"
-msgstr "Ballad"
-
-#: src/vorbis/fileinfo.c:115
-msgid "Power Ballad"
-msgstr "Power Ballad"
-
-#: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
 msgstr "Ritmik Soul"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/vorbis/fileinfo.c:116
+#: src/vorbis/fileinfo.c:113
 msgid "Duet"
 msgstr "Düet"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "Drum Solo"
 msgstr "Davul Solo"
 
-#: src/vorbis/fileinfo.c:117
+#: src/vorbis/fileinfo.c:114
 msgid "A Cappella"
 msgstr "Cappella"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Dance Hall"
 msgstr "Dans Salonu"
 
-#: src/vorbis/fileinfo.c:118
+#: src/vorbis/fileinfo.c:115
 msgid "Goa"
 msgstr "Goa"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Drum & Bass"
 msgstr "Davul & Bas"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/vorbis/fileinfo.c:119
+#: src/vorbis/fileinfo.c:116
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Terror"
 msgstr "Terör"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Indie"
 msgstr "Indie"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "BritPop"
 msgstr "BritPop"
 
-#: src/vorbis/fileinfo.c:120
+#: src/vorbis/fileinfo.c:117
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Beat"
 msgstr "Beat"
 
-#: src/vorbis/fileinfo.c:121
+#: src/vorbis/fileinfo.c:118
 msgid "Christian Gangsta Rap"
 msgstr "Christian Gangsta Rap"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/vorbis/fileinfo.c:122
+#: src/vorbis/fileinfo.c:119
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Contemporary Christian"
 msgstr "Contemporary Christian"
 
-#: src/vorbis/fileinfo.c:123
+#: src/vorbis/fileinfo.c:120
 msgid "Christian Rock"
 msgstr "Christian Rock"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/vorbis/fileinfo.c:124
+#: src/vorbis/fileinfo.c:121
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Anime"
 msgstr "Anime"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "JPop"
 msgstr "JPop"
 
-#: src/vorbis/fileinfo.c:125
+#: src/vorbis/fileinfo.c:122
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/vorbis/fileinfo.c:210
+#: src/vorbis/fileinfo.c:207
 #, c-format
 msgid ""
 "An error occured:\n"
@@ -5452,126 +5648,126 @@
 "Bir hata oluştu:\n"
 "%s"
 
-#: src/vorbis/fileinfo.c:212
+#: src/vorbis/fileinfo.c:209
 msgid "Error!"
 msgstr "Hata!"
 
-#: src/vorbis/fileinfo.c:244
+#: src/vorbis/fileinfo.c:241
 msgid "Failed to modify tag (open)"
 msgstr "Etiket düzenlenemedi (aç)"
 
-#: src/vorbis/fileinfo.c:297
+#: src/vorbis/fileinfo.c:294
 msgid "Failed to modify tag (close)"
 msgstr "Etiket düzenlenemedi (kapat)"
 
-#: src/vorbis/fileinfo.c:324 src/vorbis/fileinfo.c:333
+#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330
 msgid "Failed to modify tag"
 msgstr "Etiket düzenlenemedi"
 
-#: src/vorbis/fileinfo.c:577
+#: src/vorbis/fileinfo.c:574
 msgid " Ogg Vorbis Tag "
 msgstr " Ogg Vorbis Etiketi "
 
-#: src/vorbis/fileinfo.c:629
+#: src/vorbis/fileinfo.c:626
 msgid "Date:"
 msgstr "Tarih:"
 
-#: src/vorbis/fileinfo.c:671
+#: src/vorbis/fileinfo.c:668
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: src/vorbis/fileinfo.c:681
+#: src/vorbis/fileinfo.c:678
 msgid "Location:"
 msgstr "Yer:"
 
-#: src/vorbis/fileinfo.c:691
+#: src/vorbis/fileinfo.c:688
 msgid "Version:"
 msgstr "Sürüm:"
 
-#: src/vorbis/fileinfo.c:702
+#: src/vorbis/fileinfo.c:699
 msgid "ISRC number:"
 msgstr "ISRC numarası:"
 
-#: src/vorbis/fileinfo.c:713
+#: src/vorbis/fileinfo.c:710
 msgid "Organization:"
 msgstr "Kurum:"
 
-#: src/vorbis/fileinfo.c:760
+#: src/vorbis/fileinfo.c:757
 msgid " Ogg Vorbis ReplayGain "
 msgstr " Ogg Vorbis ReplayGain "
 
-#: src/vorbis/fileinfo.c:766
+#: src/vorbis/fileinfo.c:763
 msgid "Track gain:"
 msgstr "Parça ses yüksekliği:"
 
-#: src/vorbis/fileinfo.c:776
+#: src/vorbis/fileinfo.c:773
 msgid "Track peak:"
 msgstr "Parça doruğu:"
 
-#: src/vorbis/fileinfo.c:787
+#: src/vorbis/fileinfo.c:784
 msgid "Album gain:"
 msgstr "Albüm ses yüksekliği:"
 
-#: src/vorbis/fileinfo.c:797
+#: src/vorbis/fileinfo.c:794
 msgid "Album peak:"
 msgstr "Albüm doruğu:"
 
-#: src/vorbis/fileinfo.c:826
+#: src/vorbis/fileinfo.c:823
 msgid " Ogg Vorbis Info "
 msgstr " Ogg Vorbis Bilgisi "
 
-#: src/vorbis/fileinfo.c:841 src/vorbis/fileinfo.c:918
+#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915
 msgid "Bit rate:"
 msgstr "Bit oranı:"
 
-#: src/vorbis/fileinfo.c:854 src/vorbis/fileinfo.c:921
+#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918
 msgid "Sample rate:"
 msgstr "Örnekleme oranı:"
 
-#: src/vorbis/fileinfo.c:880 src/vorbis/fileinfo.c:927
+#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924
 msgid "Length:"
 msgstr "Uzunluk:"
 
-#: src/vorbis/fileinfo.c:893 src/vorbis/fileinfo.c:930
+#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927
 msgid "File size:"
 msgstr "Dosya boytu:"
 
-#: src/vorbis/fileinfo.c:919 src/vorbis/fileinfo.c:922
-#: src/vorbis/fileinfo.c:925 src/vorbis/fileinfo.c:928
-#: src/vorbis/fileinfo.c:931
+#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919
+#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925
+#: src/vorbis/fileinfo.c:928
 msgid "N/A"
 msgstr "N/A"
 
-#: src/vorbis/fileinfo.c:961
+#: src/vorbis/fileinfo.c:958
 #, c-format
 msgid "%d KBit/s (nominal)"
 msgstr "%d KBit/s (nominal)"
 
-#: src/vorbis/fileinfo.c:963
+#: src/vorbis/fileinfo.c:960
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: src/vorbis/fileinfo.c:965
+#: src/vorbis/fileinfo.c:962
 #, c-format
 msgid "%d:%.2d"
 msgstr "%d:%.2d"
 
-#: src/vorbis/fileinfo.c:967
+#: src/vorbis/fileinfo.c:964
 #, c-format
 msgid "%d Bytes"
 msgstr "%d Byte"
 
-#: src/vorbis/fileinfo.c:1024
+#: src/vorbis/fileinfo.c:1021
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/vorbis/vorbis.c:862
+#: src/vorbis/vorbis.c:845
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "OGG Vorbis Ses Eklentisi Hakkında"
 
-#: src/vorbis/vorbis.c:868
+#: src/vorbis/vorbis.c:851
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5707,11 +5903,11 @@
 msgid "General Plugin Settings:"
 msgstr "ReplayGain Ayarları:"
 
-#: src/wav/wav-sndfile.c:549
+#: src/wav/wav-sndfile.c:526
 msgid "About sndfile WAV support"
 msgstr "sndfile WAV desteği hakkında"
 
-#: src/wav/wav-sndfile.c:550
+#: src/wav/wav-sndfile.c:527
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -5754,14 +5950,30 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/wav/wav-sndfile.c:574
+#: src/wav/wav-sndfile.c:551
 msgid "sndfile WAV plugin"
 msgstr "sndfile WAV eklentisi"
 
-#: src/wma/wma.c:143
-#, c-format
-msgid "About %s"
-msgstr "%s Hakkında"
+#: src/wma/wma.c:132
+msgid ""
+"Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
+"McMCC (mcmcc@mail.ru)\n"
+"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
+"<bogorodskiy@inbox.ru>.\n"
+"This plugin based on source code "
+msgstr ""
+
+#~ msgid "Use software volume control"
+#~ msgstr "Yazılımsal ses kontrolü kullan"
+
+#, fuzzy
+#~ msgid ""
+#~ "You cannot use the FileWriter plugin\n"
+#~ "when you're running in realtime mode."
+#~ msgstr ""
+#~ "Gerçek zamanlı kipte çalışırken\n"
+#~ "disk yazma eklentisini kullanamazsınız."
 
 #, fuzzy
 #~ msgid "Subtune Control"
@@ -5772,10 +5984,6 @@
 #~ msgstr "Genel başlıkları geçersiz kıl"
 
 #, fuzzy
-#~ msgid "Song name/title format:"
-#~ msgstr "Başlık biçimi:"
-
-#, fuzzy
 #~ msgid "No sub-tune control."
 #~ msgstr "Ses kontrolü:"
 
@@ -6226,9 +6434,6 @@
 #~ msgid "Convert character set from :"
 #~ msgstr "Karakter seti çeviri başlangıcı:"
 
-#~ msgid "to :"
-#~ msgstr "sonu:"
-
 #~ msgid "Disable bitrate update during playback (saves cpu usage)"
 #~ msgstr ""
 #~ "Çalarken ses kalitesini güncellemeyi devre dışı bırak (işlemci gücünü "
@@ -6252,9 +6457,6 @@
 #~ msgid "Noise shaping"
 #~ msgstr "Gürültü biçimlendrme"
 
-#~ msgid "none"
-#~ msgstr "hiçbiri"
-
 #~ msgid "low"
 #~ msgstr "Düşük"
 
--- a/po/update-potfiles.sh	Thu Nov 01 15:37:43 2007 +0100
+++ b/po/update-potfiles.sh	Thu Nov 01 15:38:07 2007 +0100
@@ -1,4 +1,5 @@
 #!/bin/bash
 rm POTFILES*
+echo "# Please don't update this file manually - use ./update-potfiles.sh instead!" > POTFILES.in
 cd ..
-find src/ \( -name "*.c*" -o -name "*.glade" \) -exec grep -lE "translatable|_\(" \{\} \; | sort | uniq > po/POTFILES.in
+find src/ \( -name "*.c*" -o -name "*.glade" \) -exec grep -lE "translatable|_\(" \{\} \; | sort | uniq >> po/POTFILES.in
--- a/src/CoreAudio/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/CoreAudio/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -62,18 +62,18 @@
 		if (osx_cfg.alt_mixer_device[0] != '/') 
 			osx_cfg.use_alt_mixer_device = FALSE;
 	
-	cfgfile = bmp_cfg_db_open();
+	cfgfile = aud_cfg_db_open();
 
-	bmp_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device);
-	bmp_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device);
-	bmp_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size);
-	bmp_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer);
-	bmp_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master);
-	bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device);
-	bmp_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device);
-	bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device);
-	bmp_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device);
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device);
+	aud_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device);
+	aud_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size);
+	aud_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer);
+	aud_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master);
+	aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device);
+	aud_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device);
+	aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device);
+	aud_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device);
+	aud_cfg_db_close(cfgfile);
 
 	gtk_widget_destroy(configure_win);
 }
--- a/src/CoreAudio/init.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/CoreAudio/init.c	Thu Nov 01 15:38:07 2007 +0100
@@ -39,17 +39,17 @@
 	osx_cfg.alt_audio_device = NULL;
 	osx_cfg.use_master=0;
 	
-	if ((cfgfile = bmp_cfg_db_open()))
+	if ((cfgfile = aud_cfg_db_open()))
 	{
-		bmp_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device);
-		bmp_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device);
-		bmp_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size);
-		bmp_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer);
-		bmp_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master);
-		bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device);
-		bmp_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device);
-		bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device);
-		bmp_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device);
-		bmp_cfg_db_close(cfgfile);
+		aud_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device);
+		aud_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device);
+		aud_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size);
+		aud_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer);
+		aud_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master);
+		aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device);
+		aud_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device);
+		aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device);
+		aud_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device);
+		aud_cfg_db_close(cfgfile);
 	}
 }
--- a/src/OSS/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/OSS/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -73,22 +73,22 @@
         if (oss_cfg.alt_mixer_device[0] != '/')
             oss_cfg.use_alt_mixer_device = FALSE;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);
-    bmp_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device);
-    bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size);
-    bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer);
-    bmp_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master);
-    bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device",
+    aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);
+    aud_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device);
+    aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size);
+    aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer);
+    aud_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master);
+    aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device",
                         oss_cfg.use_alt_audio_device);
-    bmp_cfg_db_set_string(db, "OSS", "alt_audio_device",
+    aud_cfg_db_set_string(db, "OSS", "alt_audio_device",
                           oss_cfg.alt_audio_device);
-    bmp_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device",
+    aud_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device",
                         oss_cfg.use_alt_mixer_device);
-    bmp_cfg_db_set_string(db, "OSS", "alt_mixer_device",
+    aud_cfg_db_set_string(db, "OSS", "alt_mixer_device",
                           oss_cfg.alt_mixer_device);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 }
 
 static void
--- a/src/OSS/init.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/OSS/init.c	Thu Nov 01 15:38:07 2007 +0100
@@ -42,20 +42,20 @@
     oss_cfg.alt_audio_device = NULL;
     oss_cfg.use_master = 0;
 
-    if ((db = bmp_cfg_db_open())) {
-        bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
-        bmp_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device);
-        bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size);
-        bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
-        bmp_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master);
-        bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
+    if ((db = aud_cfg_db_open())) {
+        aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
+        aud_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device);
+        aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size);
+        aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
+        aud_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master);
+        aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
                             &oss_cfg.use_alt_audio_device);
-        bmp_cfg_db_get_string(db, "OSS", "alt_audio_device",
+        aud_cfg_db_get_string(db, "OSS", "alt_audio_device",
                               &oss_cfg.alt_audio_device);
-        bmp_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device",
+        aud_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device",
                             &oss_cfg.use_alt_mixer_device);
-        bmp_cfg_db_get_string(db, "OSS", "alt_mixer_device",
+        aud_cfg_db_get_string(db, "OSS", "alt_mixer_device",
                               &oss_cfg.alt_mixer_device);
-        bmp_cfg_db_close(db);
+        aud_cfg_db_close(db);
     }
 }
--- a/src/OSS4/OSS4.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/OSS4/OSS4.c	Thu Nov 01 15:38:07 2007 +0100
@@ -53,9 +53,9 @@
 void oss_cleanup(void)
 {
     ConfigDb *db;
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "OSS", "saved_volume", vol);
-    bmp_cfg_db_close(db);
+    db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "OSS", "saved_volume", vol);
+    aud_cfg_db_close(db);
 
     if (oss_cfg.alt_audio_device) {
         free(oss_cfg.alt_audio_device);
--- a/src/OSS4/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/OSS4/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -63,17 +63,17 @@
         if (oss_cfg.alt_audio_device[0] != '/')
             oss_cfg.use_alt_audio_device = FALSE;
     
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);
-    bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size);
-    bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer);
-    bmp_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume);
-    bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device",
+    aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);
+    aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size);
+    aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer);
+    aud_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume);
+    aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device",
                         oss_cfg.use_alt_audio_device);
-    bmp_cfg_db_set_string(db, "OSS", "alt_audio_device",
+    aud_cfg_db_set_string(db, "OSS", "alt_audio_device",
                           oss_cfg.alt_audio_device);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 }
 
 static void
--- a/src/OSS4/init.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/OSS4/init.c	Thu Nov 01 15:38:07 2007 +0100
@@ -40,17 +40,17 @@
     oss_cfg.use_alt_audio_device = FALSE;
     oss_cfg.alt_audio_device = NULL;
 
-    if ((db = bmp_cfg_db_open())) {
-        bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
-        bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size);
-        bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
-        bmp_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume);
-        bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
+    if ((db = aud_cfg_db_open())) {
+        aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
+        aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size);
+        aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
+        aud_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume);
+        aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
                             &oss_cfg.use_alt_audio_device);
-        bmp_cfg_db_get_string(db, "OSS", "alt_audio_device",
+        aud_cfg_db_get_string(db, "OSS", "alt_audio_device",
                               &oss_cfg.alt_audio_device);
-        bmp_cfg_db_get_int(db, "OSS", "saved_volume", &vol);
-        bmp_cfg_db_close(db);
+        aud_cfg_db_get_int(db, "OSS", "saved_volume", &vol);
+        aud_cfg_db_close(db);
     }
         //volume gets saved anyway, but is ignored unless "saved_volume" is true
         if(!oss_cfg.save_volume)
--- a/src/aac/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/aac/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -56,4 +56,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lm
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm
--- a/src/aac/libmp4.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/aac/libmp4.c	Thu Nov 01 15:38:07 2007 +0100
@@ -240,8 +240,10 @@
           !strcasecmp(extension, ".aac")    // old MPEG2/4-AAC extension
        ))
           return 1;
-       else
-          return 0;
+       else {
+            aud_vfs_fclose(file);
+            return 0;
+        }
       }
       if (!memcmp(&magic[4], "ftyp", 4)) {
            aud_vfs_fclose(file);
@@ -355,20 +357,30 @@
         guint bufferSize = 0;
         faacDecHandle decoder;
 
-        if (mp4track == -1)
+        if (mp4track == -1) {
+            // clean up
+            g_free(mp4cb);
+            aud_vfs_fclose(mp4fh);
             return NULL;
+        }
 
         decoder = faacDecOpen();
         mp4ff_get_decoder_config(mp4file, mp4track, &buffer, &bufferSize);
 
         if ( !buffer ) {
             faacDecClose(decoder);
+            // clean up
+            g_free(mp4cb);
+            aud_vfs_fclose(mp4fh);
             return FALSE;
         }
         if ( faacDecInit2(decoder, buffer, bufferSize,
                   &samplerate, &channels) < 0 ) {
             faacDecClose(decoder);
 
+            // clean up
+            g_free(mp4cb);
+            aud_vfs_fclose(mp4fh);
             return FALSE;
         }
 
--- a/src/adplug/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/adplug/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -61,4 +61,4 @@
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
-LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/adplug/adplug-xmms.cc	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/adplug/adplug-xmms.cc	Thu Nov 01 15:38:07 2007 +0100
@@ -1036,14 +1036,14 @@
 adplug_init (void)
 {
   dbg_printf ("adplug_init(): open, ");
-  ConfigDb *db = bmp_cfg_db_open ();
+  ConfigDb *db = aud_cfg_db_open ();
 
   // Read configuration
   dbg_printf ("read, ");
-  bmp_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16);
-  bmp_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo);
-  bmp_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq);
-  bmp_cfg_db_get_bool (db, CFG_VERSION, "Endless",
+  aud_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16);
+  aud_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo);
+  aud_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq);
+  aud_cfg_db_get_bool (db, CFG_VERSION, "Endless",
                        (gboolean *) & conf.endless);
 
   // Read file type exclusion list
@@ -1052,7 +1052,7 @@
     gchar *cfgstr = NULL, *exclude = NULL;
     gboolean cfgread;
 
-    cfgread = bmp_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr);
+    cfgread = aud_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr);
     if (cfgread) {
         exclude = (char *) malloc (strlen (cfgstr) + 2);
         strcpy (exclude, cfgstr);
@@ -1063,7 +1063,7 @@
         free (exclude); free (cfgstr);
     }
   }
-  bmp_cfg_db_close (db);
+  aud_cfg_db_close (db);
 
   // Load database from disk and hand it to AdPlug
   dbg_printf ("database");
@@ -1088,7 +1088,7 @@
 adplug_quit (void)
 {
   dbg_printf ("adplug_quit(): open, ");
-  ConfigDb *db = bmp_cfg_db_open ();
+  ConfigDb *db = aud_cfg_db_open ();
 
   // Close database
   dbg_printf ("db, ");
@@ -1097,10 +1097,10 @@
 
   // Write configuration
   dbg_printf ("write, ");
-  bmp_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16);
-  bmp_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo);
-  bmp_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq);
-  bmp_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless);
+  aud_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16);
+  aud_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo);
+  aud_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq);
+  aud_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless);
 
   dbg_printf ("exclude, ");
   std::string exclude;
@@ -1114,11 +1114,11 @@
       exclude += (*i)->filetype;
     }
   gchar *cfgval = g_strdup (exclude.c_str ());
-  bmp_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval);
+  aud_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval);
   free (cfgval);
 
   dbg_printf ("close");
-  bmp_cfg_db_close (db);
+  aud_cfg_db_close (db);
   dbg_printf (".\n");
 }
 
--- a/src/alarm/alarm.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/alarm/alarm.c	Thu Nov 01 15:38:07 2007 +0100
@@ -177,18 +177,18 @@
 
    DEBUG("alarm_save\n");
 
-   conf = bmp_cfg_db_open();
+   conf = aud_cfg_db_open();
 
    /*
     * update the live values and write them out
     */
    alarm_h = alarm_conf.default_hour = 
      gtk_spin_button_get_value_as_int(alarm_conf.alarm_h);
-   bmp_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h);
+   aud_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h);
 
    alarm_m = alarm_conf.default_min = 
      gtk_spin_button_get_value_as_int(alarm_conf.alarm_m);
-   bmp_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m);
+   aud_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m);
 
 
    stop_h =
@@ -216,20 +216,20 @@
      alarm_conf.day[daynum].min = 
        gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min);
 
-     bmp_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
-     bmp_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour);
-     bmp_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min);
+     aud_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
+     aud_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour);
+     aud_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min);
    }
 
    /* END: days of week */
 
    volume =
      gtk_range_get_adjustment(alarm_conf.volume)->value;
-   bmp_cfg_db_set_int(conf, "alarm", "volume", volume);
+   aud_cfg_db_set_int(conf, "alarm", "volume", volume);
 
    quietvol =
      gtk_range_get_adjustment(alarm_conf.quietvol)->value;
-   bmp_cfg_db_set_int(conf, "alarm", "quietvol", quietvol);
+   aud_cfg_db_set_int(conf, "alarm", "quietvol", quietvol);
 
    fading =
      gtk_spin_button_get_value_as_int(alarm_conf.fading);
@@ -252,38 +252,38 @@
    else
    {
 	   /* write the new values */
-	   bmp_cfg_db_set_int(conf, "alarm", "stop_h", stop_h);
-	   bmp_cfg_db_set_int(conf, "alarm", "stop_m", stop_m);
-	   bmp_cfg_db_set_int(conf, "alarm", "fading", fading);
-	   bmp_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on);
+	   aud_cfg_db_set_int(conf, "alarm", "stop_h", stop_h);
+	   aud_cfg_db_set_int(conf, "alarm", "stop_m", stop_m);
+	   aud_cfg_db_set_int(conf, "alarm", "fading", fading);
+	   aud_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on);
    }
 
 
    g_free(cmdstr);
    cmdstr = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.cmdstr),
 				   0, -1);
-   bmp_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr);
+   aud_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr);
 
    cmd_on =
      gtk_toggle_button_get_active(alarm_conf.cmd_on);
-   bmp_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on);
+   aud_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on);
 
    g_free(playlist);
    playlist = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.playlist),
 				     0, -1);
-   bmp_cfg_db_set_string(conf, "alarm", "playlist", playlist);
+   aud_cfg_db_set_string(conf, "alarm", "playlist", playlist);
 
    /* reminder */
    g_free(alarm_conf.reminder_msg);
    alarm_conf.reminder_msg = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.reminder),
        0, -1);
-   bmp_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg);
+   aud_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg);
    
    alarm_conf.reminder_on = 
      gtk_toggle_button_get_active(alarm_conf.reminder_cb);
-   bmp_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on);
+   aud_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on);
 
-   bmp_cfg_db_close(conf);
+   aud_cfg_db_close(conf);
 }
 
 /*
@@ -296,50 +296,50 @@
 
    DEBUG("alarm_read_config\n");
 
-   conf = bmp_cfg_db_open();
+   conf = aud_cfg_db_open();
 
-   if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h))
+   if(!aud_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h))
      alarm_h = DEFAULT_ALARM_HOUR;
-   if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m))
+   if(!aud_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m))
      alarm_m = DEFAULT_ALARM_MIN;
 
    /* save them here too */
    alarm_conf.default_hour = alarm_h;
    alarm_conf.default_min = alarm_m;
 
-   if(!bmp_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h))
+   if(!aud_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h))
      stop_h = DEFAULT_STOP_HOURS;
-   if(!bmp_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m))
+   if(!aud_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m))
      stop_m = DEFAULT_STOP_MINS;
-   if(!bmp_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on))
+   if(!aud_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on))
      stop_on = TRUE;
 
-   if(!bmp_cfg_db_get_int(conf, "alarm", "volume", &volume))
+   if(!aud_cfg_db_get_int(conf, "alarm", "volume", &volume))
      volume = DEFAULT_VOLUME;
-   if(!bmp_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol))
+   if(!aud_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol))
      quietvol = DEFAULT_QUIET_VOL;
 
-   if(!bmp_cfg_db_get_int(conf, "alarm", "fading", &fading))
+   if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading))
      fading = DEFAULT_FADING;
 
-   if(!bmp_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
+   if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
      cmdstr = g_strdup("");
-   if(!bmp_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
+   if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
      cmd_on = FALSE;
 
-   if(!bmp_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
+   if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
      playlist = g_strdup("");
 
-   if(!bmp_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
+   if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
      alarm_conf.reminder_msg = g_strdup("");
-   if(!bmp_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
+   if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
      alarm_conf.reminder_on = FALSE;
 
    /* day flags and times */
    for(; daynum < 7; daynum++)
    {
      /* read the flags */
-     if(!bmp_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) {
+     if(!aud_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) {
        // only turn alarm off by default on a sunday
        if(daynum != 0)
          alarm_conf.day[daynum].flags = DEFAULT_FLAGS;
@@ -348,10 +348,10 @@
      }
 
      /* read the times */
-     if(!bmp_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour))
+     if(!aud_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour))
        alarm_conf.day[daynum].hour = DEFAULT_ALARM_HOUR;
 
-     if(!bmp_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min))
+     if(!aud_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min))
        alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
    }
 
--- a/src/alsa/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/alsa/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -46,16 +46,16 @@
 
 void alsa_save_config(void)
 {
-	ConfigDb *cfgfile = bmp_cfg_db_open();
+	ConfigDb *cfgfile = aud_cfg_db_open();
 
-	bmp_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time);
-	bmp_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time);
-	bmp_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device);
-	bmp_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card);
-	bmp_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device);
-	bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left);
-	bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right);
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time);
+	aud_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time);
+	aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device);
+	aud_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card);
+	aud_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device);
+	aud_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left);
+	aud_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right);
+	aud_cfg_db_close(cfgfile);
 }
 
 static int get_cards(GtkOptionMenu *omenu, GtkSignalFunc cb, int active)
--- a/src/alsa/init.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/alsa/init.c	Thu Nov 01 15:38:07 2007 +0100
@@ -35,20 +35,20 @@
 	alsa_cfg.vol.left = 100;
 	alsa_cfg.vol.right = 100;
 
-	cfgfile = bmp_cfg_db_open();
-	if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "pcm_device",
+	cfgfile = aud_cfg_db_open();
+	if (!aud_cfg_db_get_string(cfgfile, "ALSA", "pcm_device",
 				  &alsa_cfg.pcm_device))
 		alsa_cfg.pcm_device = g_strdup("default");
 	g_message("device: %s", alsa_cfg.pcm_device);
-	if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "mixer_device",
+	if (!aud_cfg_db_get_string(cfgfile, "ALSA", "mixer_device",
 				  &alsa_cfg.mixer_device))
 		alsa_cfg.mixer_device = g_strdup("PCM");
-	bmp_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card);
-	bmp_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time);
-	bmp_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time);
+	aud_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card);
+	aud_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time);
+	aud_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time);
 
-	bmp_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug);
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug);
+	aud_cfg_db_close(cfgfile);
 
 	if (dlopen("libasound.so.2", RTLD_NOW | RTLD_GLOBAL) == NULL)
 	{
--- a/src/amidi-plug/backend-alsa/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/amidi-plug/backend-alsa/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} ${ALSA_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${ALSA_CFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ${ALSA_LIBS} ../pcfg/libpcfg.a
+LIBS += ${ALSA_LIBS} ${GLIB_LIBS} ../pcfg/libpcfg.a
--- a/src/amidi-plug/backend-dummy/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/amidi-plug/backend-dummy/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ../pcfg/libpcfg.a
+LIBS += ../pcfg/libpcfg.a ${GLIB_LIBS}
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} ${FLUIDSYNTH_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${FLUIDSYNTH_CFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ${FLUIDSYNTH_LIBS} ../pcfg/libpcfg.a
+LIBS += ${FLUIDSYNTH_LIBS} ${GLIB_LIBS} ../pcfg/libpcfg.a
--- a/src/aosd/aosd_cfg.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/aosd/aosd_cfg.c	Thu Nov 01 15:38:07 2007 +0100
@@ -222,42 +222,42 @@
 gint
 aosd_cfg_load ( aosd_cfg_t * cfg )
 {
-  ConfigDb *cfgfile = bmp_cfg_db_open();
+  ConfigDb *cfgfile = aud_cfg_db_open();
   gint i = 0;
   gint max_numcol;
   gchar *trig_active_str;
 
   /* position */
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "position_placement" , &(cfg->osd->position.placement) ) )
     cfg->osd->position.placement = AOSD_POSITION_PLACEMENT_TOPLEFT;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "position_offset_x" , &(cfg->osd->position.offset_x) ) )
     cfg->osd->position.offset_x = 0;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "position_offset_y" , &(cfg->osd->position.offset_y) ) )
     cfg->osd->position.offset_y = 0;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "position_maxsize_width" , &(cfg->osd->position.maxsize_width) ) )
     cfg->osd->position.maxsize_width = 0;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "position_multimon_id" , &(cfg->osd->position.multimon_id) ) )
     cfg->osd->position.multimon_id = -1;
 
   /* animation */
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "animation_timing_display" , &(cfg->osd->animation.timing_display) ) )
     cfg->osd->animation.timing_display = 3000;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "animation_timing_fadein" , &(cfg->osd->animation.timing_fadein) ) )
     cfg->osd->animation.timing_fadein = 300;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "animation_timing_fadeout" , &(cfg->osd->animation.timing_fadeout) ) )
     cfg->osd->animation.timing_fadeout = 300;
 
@@ -267,38 +267,38 @@
     gchar *color_str = NULL;
     gchar *key_str = NULL;
     key_str = g_strdup_printf( "text_fonts_name_%i" , i );
-    if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) )
+    if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) )
       cfg->osd->text.fonts_name[i] = g_strdup( "Sans 26" );
     g_free( key_str );
     key_str = g_strdup_printf( "text_fonts_color_%i" , i );
-    if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
+    if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
       color_str = g_strdup( "65535,65535,65535,65535" ); /* white , alpha 100% */
     aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_color[i]) );
     g_free( key_str );
     g_free( color_str );
     key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i );
-    if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) )
+    if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) )
       cfg->osd->text.fonts_draw_shadow[i] = TRUE;
     g_free( key_str );
     key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i );
-    if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
+    if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
       color_str = g_strdup( "0,0,0,32767" ); /* black , alpha 50% */
     aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_shadow_color[i]) );
     g_free( key_str );
     g_free( color_str );
   }
 
-  if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_bool( cfgfile , "aosd" ,
        "text_utf8conv_disable" , &(cfg->osd->text.utf8conv_disable) ) )
     cfg->osd->text.utf8conv_disable = FALSE;
 
   /* decoration */
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "decoration_code" , &(cfg->osd->decoration.code) ) )
     cfg->osd->decoration.code = aosd_deco_style_get_first_code();
 
   /* TODO not implemented yet 
-  if ( !bmp_cfg_db_get_string( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_string( cfgfile , "aosd" ,
        "decoration_skin_file" , &(cfg->osd->decoration.skin_file) ) )
     cfg->osd->decoration.skin_file = g_strdup( "" );
   */
@@ -311,7 +311,7 @@
     gchar *color_str = NULL;
     aosd_color_t color;
     key_str = g_strdup_printf( "decoration_color_%i" , i );
-    if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
+    if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
     {
       /* we have different default values for the decoration colors */
       switch ( i )
@@ -335,7 +335,7 @@
   }
 
   /* trigger */
-  if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) )
+  if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) )
   {
     gint trig_active_defval = 0;
     g_array_append_val( cfg->osd->trigger.active , trig_active_defval );
@@ -354,11 +354,11 @@
   }
 
   /* miscellanous */
-  if ( !bmp_cfg_db_get_int( cfgfile , "aosd" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
        "transparency_mode" , &(cfg->osd->misc.transparency_mode) ) )
     cfg->osd->misc.transparency_mode = AOSD_MISC_TRANSPARENCY_FAKE;
 
-  bmp_cfg_db_close( cfgfile );
+  aud_cfg_db_close( cfgfile );
 
   /* the config object has been filled with information */
   cfg->set = TRUE;
@@ -370,7 +370,7 @@
 gint
 aosd_cfg_save ( aosd_cfg_t * cfg )
 {
-  ConfigDb *cfgfile = bmp_cfg_db_open();
+  ConfigDb *cfgfile = aud_cfg_db_open();
   gint i = 0;
   gint max_numcol;
   GString *string = g_string_new( "" );
@@ -379,29 +379,29 @@
     return -1;
 
   /* position */
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "position_placement" , cfg->osd->position.placement );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "position_offset_x" , cfg->osd->position.offset_x );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "position_offset_y" , cfg->osd->position.offset_y );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "position_maxsize_width" , cfg->osd->position.maxsize_width );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "position_multimon_id" , cfg->osd->position.multimon_id );
 
   /* animation */
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "animation_timing_display" , cfg->osd->animation.timing_display );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "animation_timing_fadein" , cfg->osd->animation.timing_fadein );
 
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "animation_timing_fadeout" , cfg->osd->animation.timing_fadeout );
 
   /* text */
@@ -410,36 +410,36 @@
     gchar *color_str = NULL;
     gchar *key_str = NULL;
     key_str = g_strdup_printf( "text_fonts_name_%i" , i );
-    bmp_cfg_db_set_string( cfgfile , "aosd" ,
+    aud_cfg_db_set_string( cfgfile , "aosd" ,
       key_str , cfg->osd->text.fonts_name[i] );
     g_free( key_str );
     key_str = g_strdup_printf( "text_fonts_color_%i" , i );
     aosd_cfg_util_color_to_str( cfg->osd->text.fonts_color[i] , &color_str );
-    bmp_cfg_db_set_string( cfgfile , "aosd" ,
+    aud_cfg_db_set_string( cfgfile , "aosd" ,
       key_str , color_str );
     g_free( key_str );
     g_free( color_str );
     key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i );
-    bmp_cfg_db_set_bool( cfgfile , "aosd" ,
+    aud_cfg_db_set_bool( cfgfile , "aosd" ,
       key_str , cfg->osd->text.fonts_draw_shadow[i] );
     g_free( key_str );
     key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i );
     aosd_cfg_util_color_to_str( cfg->osd->text.fonts_shadow_color[i] , &color_str );
-    bmp_cfg_db_set_string( cfgfile , "aosd" ,
+    aud_cfg_db_set_string( cfgfile , "aosd" ,
       key_str , color_str );
     g_free( key_str );
     g_free( color_str );
   }
 
-  bmp_cfg_db_set_bool( cfgfile , "aosd" ,
+  aud_cfg_db_set_bool( cfgfile , "aosd" ,
     "text_utf8conv_disable" , cfg->osd->text.utf8conv_disable );
 
   /* decoration */
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "decoration_code" , cfg->osd->decoration.code );
 
   /* TODO skip this since it's not implemented yet
-  bmp_cfg_db_set_string( cfgfile , "aosd" ,
+  aud_cfg_db_set_string( cfgfile , "aosd" ,
     "decoration_skin_file" , cfg->osd->decoration.skin_file ); */
 
   /* decoration - colors */
@@ -451,7 +451,7 @@
     aosd_color_t color = g_array_index( cfg->osd->decoration.colors , aosd_color_t , i );
     key_str = g_strdup_printf( "decoration_color_%i" , i );
     aosd_cfg_util_color_to_str( color , &color_str );
-    bmp_cfg_db_set_string( cfgfile , "aosd" ,
+    aud_cfg_db_set_string( cfgfile , "aosd" ,
       key_str , color_str );
     g_free( key_str );
     g_free( color_str );
@@ -464,14 +464,14 @@
     g_string_truncate( string , string->len - 1 );
   else
     g_string_assign( string , "x" );
-  bmp_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str );
+  aud_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str );
   g_string_free( string , TRUE );
 
   /* miscellaneous */
-  bmp_cfg_db_set_int( cfgfile , "aosd" ,
+  aud_cfg_db_set_int( cfgfile , "aosd" ,
     "transparency_mode" , cfg->osd->misc.transparency_mode );
 
-  bmp_cfg_db_close( cfgfile );
+  aud_cfg_db_close( cfgfile );
 
   return 0;
 }
--- a/src/arts/audio.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/arts/audio.c	Thu Nov 01 15:38:07 2007 +0100
@@ -62,10 +62,10 @@
 
 	artsxmms_cfg.buffer_size = 400;
 	
-	db = bmp_cfg_db_open();
-	bmp_cfg_db_get_int(db, "arts", "buffer_size",
+	db = aud_cfg_db_open();
+	aud_cfg_db_get_int(db, "arts", "buffer_size",
 			  &artsxmms_cfg.buffer_size);
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 
--- a/src/arts/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/arts/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -23,9 +23,9 @@
 	artsxmms_cfg.buffer_size =
 		gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_spin));
 
-	db = bmp_cfg_db_open();
-	bmp_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size);
-	bmp_cfg_db_close(db);
+	db = aud_cfg_db_open();
+	aud_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size);
+	aud_cfg_db_close(db);
 
 	gtk_widget_destroy(configure_win);
 }
--- a/src/audiocompress/audacious-glue.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/audiocompress/audacious-glue.c	Thu Nov 01 15:38:07 2007 +0100
@@ -13,7 +13,7 @@
 #include <audacious/util.h>
 #include <audacious/configdb.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 typedef struct {
@@ -122,20 +122,20 @@
 {
 	ConfigDb *db;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
-	bmp_cfg_db_get_bool(db, "AudioCompress",
+	aud_cfg_db_get_bool(db, "AudioCompress",
 			       "anticlip", &prefs->anticlip);
-	bmp_cfg_db_get_int(db, "AudioCompress", "target",
+	aud_cfg_db_get_int(db, "AudioCompress", "target",
 			   &prefs->target);
-	bmp_cfg_db_get_int(db, "AudioCompress", "gainmax",
+	aud_cfg_db_get_int(db, "AudioCompress", "gainmax",
 			   &prefs->gainmax);
-	bmp_cfg_db_get_int(db, "AudioCompress",
+	aud_cfg_db_get_int(db, "AudioCompress",
 			   "gainsmooth", &prefs->gainsmooth);
-	bmp_cfg_db_get_int(db, "AudioCompress", "buckets",
+	aud_cfg_db_get_int(db, "AudioCompress", "buckets",
 			   &prefs->buckets);
 
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 
 	if ((prefs->gainmax == 0) && (prefs->gainsmooth == 0) && (prefs->buckets == 0)) {
 		prefs->anticlip = ANTICLIP;
@@ -161,20 +161,20 @@
 {
 	ConfigDb *db;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
-	bmp_cfg_db_set_bool(db, "AudioCompress", "anticlip",
+	aud_cfg_db_set_bool(db, "AudioCompress", "anticlip",
 			    prefs->anticlip);
-	bmp_cfg_db_set_int(db, "AudioCompress", "target",
+	aud_cfg_db_set_int(db, "AudioCompress", "target",
 			    prefs->target);
-	bmp_cfg_db_set_int(db, "AudioCompress", "gainmax",
+	aud_cfg_db_set_int(db, "AudioCompress", "gainmax",
 			    prefs->gainmax);
-	bmp_cfg_db_set_int(db, "AudioCompress", "gainsmooth",
+	aud_cfg_db_set_int(db, "AudioCompress", "gainsmooth",
 			    prefs->gainsmooth);
-	bmp_cfg_db_set_int(db, "AudioCompress", "buckets",
+	aud_cfg_db_set_int(db, "AudioCompress", "buckets",
 			    prefs->buckets);
 
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audiocompress/audiocompress_config.h	Thu Nov 01 15:38:07 2007 +0100
@@ -0,0 +1,25 @@
+/* audiocompress_config.h
+** Default values for the configuration, and also a few random debug things
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/*** Version information ***/
+#define ACVERSION "1.5.2"
+
+/*** Monitoring stuff ***/
+//#define DEBUG			/* Show debugging information */
+//#define STATS			/* Show statistics on stderr */
+
+/*** Default configuration stuff ***/
+#define ANTICLIP 0		/* Strict clipping protection */
+#define TARGET 25000		/* Target level */
+
+#define GAINMAX 32		/* The maximum amount to amplify by */
+#define GAINSHIFT 10		/* How fine-grained the gain is */
+#define GAINSMOOTH 8		/* How much inertia ramping has*/
+#define BUCKETS 400		/* How long of a history to store */
+
+#endif
+
--- a/src/audiocompress/compress.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/audiocompress/compress.c	Thu Nov 01 15:38:07 2007 +0100
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 static int *peaks = NULL;
--- a/src/audiocompress/config.h	Thu Nov 01 15:37:43 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/* config.h
-** Default values for the configuration, and also a few random debug things
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/*** Version information ***/
-#define ACVERSION "1.5.2"
-
-/*** Monitoring stuff ***/
-//#define DEBUG			/* Show debugging information */
-//#define STATS			/* Show statistics on stderr */
-
-/*** Default configuration stuff ***/
-#define ANTICLIP 0		/* Strict clipping protection */
-#define TARGET 25000		/* Target level */
-
-#define GAINMAX 32		/* The maximum amount to amplify by */
-#define GAINSHIFT 10		/* How fine-grained the gain is */
-#define GAINSMOOTH 8		/* How much inertia ramping has*/
-#define BUCKETS 400		/* How long of a history to store */
-
-#endif
-
--- a/src/blur_scope/blur_scope.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/blur_scope/blur_scope.c	Thu Nov 01 15:38:07 2007 +0100
@@ -99,12 +99,12 @@
 
     if (!config_read) {
         bscope_cfg.color = 0xFF3F7F;
-        db = bmp_cfg_db_open();
+        db = aud_cfg_db_open();
 
         if (db) {
-            bmp_cfg_db_get_int(db, "BlurScope", "color",
+            aud_cfg_db_get_int(db, "BlurScope", "color",
                                (int *) &bscope_cfg.color);
-            bmp_cfg_db_close(db);
+            aud_cfg_db_close(db);
         }
         config_read = TRUE;
     }
--- a/src/blur_scope/config.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/blur_scope/config.c	Thu Nov 01 15:38:07 2007 +0100
@@ -25,9 +25,9 @@
     bscope_cfg.color =
         ((guint32) (255.0 * color[0]) << 16) |
         ((guint32) (255.0 * color[1]) << 8) | ((guint32) (255.0 * color[2]));
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color);
-    bmp_cfg_db_close(db);
+    db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color);
+    aud_cfg_db_close(db);
     generate_cmap();
     gtk_widget_destroy(configure_win);
 }
--- a/src/cdaudio-ng/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/cdaudio-ng/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -10,4 +10,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS} ${MOWGLI_LIBS}
--- a/src/console/Audacious_Config.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/console/Audacious_Config.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -21,31 +21,31 @@
 
 void console_cfg_load( void )
 {
-    ConfigDb *db = bmp_cfg_db_open();
-    bmp_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length);
-    bmp_cfg_db_get_bool(db, "console", "resample", &audcfg.resample);
-    bmp_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate);
-    bmp_cfg_db_get_int(db, "console", "treble", &audcfg.treble);
-    bmp_cfg_db_get_int(db, "console", "bass", &audcfg.bass);
-    bmp_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length);
-    bmp_cfg_db_get_int(db, "console", "echo", &audcfg.echo);
-    bmp_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb);
-    bmp_cfg_db_close(db);
+    ConfigDb *db = aud_cfg_db_open();
+    aud_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length);
+    aud_cfg_db_get_bool(db, "console", "resample", &audcfg.resample);
+    aud_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate);
+    aud_cfg_db_get_int(db, "console", "treble", &audcfg.treble);
+    aud_cfg_db_get_int(db, "console", "bass", &audcfg.bass);
+    aud_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length);
+    aud_cfg_db_get_int(db, "console", "echo", &audcfg.echo);
+    aud_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb);
+    aud_cfg_db_close(db);
 }
 
 
 void console_cfg_save( void )
 {
-    ConfigDb *db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length);
-    bmp_cfg_db_set_bool(db, "console", "resample", audcfg.resample);
-    bmp_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate);
-    bmp_cfg_db_set_int(db, "console", "treble", audcfg.treble);
-    bmp_cfg_db_set_int(db, "console", "bass", audcfg.bass);
-    bmp_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length);
-    bmp_cfg_db_set_int(db, "console", "echo", audcfg.echo);
-    bmp_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb);
-    bmp_cfg_db_close(db);
+    ConfigDb *db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length);
+    aud_cfg_db_set_bool(db, "console", "resample", audcfg.resample);
+    aud_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate);
+    aud_cfg_db_set_int(db, "console", "treble", audcfg.treble);
+    aud_cfg_db_set_int(db, "console", "bass", audcfg.bass);
+    aud_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length);
+    aud_cfg_db_set_int(db, "console", "echo", audcfg.echo);
+    aud_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb);
+    aud_cfg_db_close(db);
 }
 
 
--- a/src/console/Audacious_Driver.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/console/Audacious_Driver.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -68,12 +68,11 @@
 public:
 	gchar* path;            // path without track number specification
 	int track;              // track number (0 = first track)
-	bool track_specified;   // false if no track number was specified in path
 	Music_Emu* emu;         // set to 0 to take ownership
 	gme_type_t type;
 	
 	// Parses path and identifies file type
-	File_Handler( const char* path, VFSFile* fd = 0, gboolean is_our_file_hack = FALSE );
+	File_Handler( const char* path, VFSFile* fd = 0 );
 	
 	// Creates emulator and returns 0. If this wasn't a music file or
 	// emulator couldn't be created, returns 1.
@@ -87,33 +86,26 @@
 	Gzip_Reader in;
 };
 
-File_Handler::File_Handler( const char* path_in, VFSFile* fd, gboolean is_our_file_hack )
+File_Handler::File_Handler( const char* path_in, VFSFile* fd )
 {
 	emu   = 0;
 	type  = 0;
 	track = 0;
-	track_specified = false;
 	
 	path = g_strdup( path_in );
 	if ( !path )
 		return; // out of memory
 	
 	// extract track number
-	gchar* args = strchr( path, '?' ); // TODO: use strrchr()?
+	gchar* args = strrchr( path, '?' ); // TODO: use strrchr()?
 	if ( args && g_ascii_isdigit( (guchar) *(args + 1) ) )
 	{
 		*args = '\0';
 		// TODO: use func with better error reporting, and perhaps don't
 		// truncate path if there is no number after ?
 		track = atoi( args + 1 ) - 1;
-		track_specified = true;
 	}
 
-	// if the track is specified, then we have a match. don't worry
-	// about it right now -nenolod
-	if (track_specified && is_our_file_hack)
-		return;
-	
 	// open vfs
 	if ( fd )
 		aud_vfs_in.reset( fd );
@@ -212,9 +204,10 @@
 		if ( info.track_count > 1 )
 		{
 			aud_tuple_associate_int(ti, FIELD_TRACK_NUMBER, NULL, track + 1);
-			aud_tuple_associate_int(ti, -1, "subsong", track + 1);
 			aud_tuple_associate_int(ti, FIELD_SUBSONG_ID, NULL, track + 1);
 			aud_tuple_associate_int(ti, FIELD_SUBSONG_NUM, NULL, info.track_count);
+			ti->nsubtunes = info.track_count;
+			ti->subtunes = NULL;
 		}
 		aud_tuple_associate_string(ti, FIELD_COPYRIGHT, NULL, info.copyright);
 		aud_tuple_associate_string(ti, -1, "console", info.system);
@@ -247,7 +240,7 @@
 
 static Tuple *get_song_tuple( gchar *path )
 {
-	Tuple* result = 0;
+	Tuple* result = NULL;
 	File_Handler fh( path );
 	if ( !fh.load( gme_info_only ) )
 	{
@@ -258,16 +251,6 @@
 	return result;
 }
 
-static void get_song_info( char* path, char** title, int* length )
-{
-	*length = -1;
-	*title = NULL;
-	
-	Tuple* ti = get_song_tuple( path );
-	if ( ti )
-		*title = format_and_free_ti( ti, length );
-}
-
 // Playback
 
 static void* play_loop_track( gpointer arg )
@@ -433,53 +416,11 @@
 	return console_ip_is_going ? playback->output->output_time() : -1;
 }
 
-static gint is_our_file_from_vfs( gchar* path, VFSFile* fd )
-{
-	gint result = 0;
-	File_Handler fh( path, fd, TRUE );
-	if ( fh.type )
-	{
-		result = 1;
-		/*
-		if ( fh.track_specified || fh.type->track_count == 1 )
-		{
-			// don't even need to read file if track is specified or
-			// that file format can't have more than one track per file
-			result = 1;
-		}
-		else if ( !fh.load( gme_info_only ) )
-		{
-			// format requires reading file info to get track count
-			if ( fh.emu->track_count() == 1 )
-			{
-				result = 1;
-			}
-			else
-			{
-				// for multi-track types, add each track to playlist
-				for (int i = 0; i < fh.emu->track_count(); i++)
-				{
-					gchar _buf[path_max];
-					g_snprintf(_buf, path_max, "%s?%d", fh.path, i);
-
-					playlist_add_url(playlist_get_active(), _buf);
-				}
-				result = -1;
-			}
-		}
-		*/
-	}
-	else if (fh.track_specified)
-	{
-		result = 1;
-	}
-
-	return result;
-}
-
 static Tuple *probe_for_tuple(gchar *filename, VFSFile *fd)
 {
-	if (!is_our_file_from_vfs(filename, fd))
+	File_Handler fh(filename, fd);
+	
+	if (!fh.type)
 		return NULL;
 
 	aud_vfs_rewind(fd);
@@ -539,13 +480,13 @@
 	NULL,
 	NULL,
 	NULL,
-	get_song_info,
+	NULL,
 	NULL,
 	NULL,
 	get_song_tuple,
 	NULL,
 	NULL,
-	is_our_file_from_vfs,
+	NULL,
 	(gchar **)gme_fmts,
 	NULL,
 	probe_for_tuple
--- a/src/console/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/console/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -61,4 +61,4 @@
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz ${MOWGLI_LIBS}
--- a/src/cue/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/cue/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB} ${MOWGLI_LIBS}
--- a/src/echo_plugin/echo.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/echo_plugin/echo.c	Thu Nov 01 15:38:07 2007 +0100
@@ -47,12 +47,12 @@
 	if (sizeof(short) != sizeof(gint16))
 		abort();
 
-	cfg = bmp_cfg_db_open();
-	bmp_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay);
-	bmp_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback);
-	bmp_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume);
-	bmp_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable);
-	bmp_cfg_db_close(cfg);
+	cfg = aud_cfg_db_open();
+	aud_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay);
+	aud_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback);
+	aud_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume);
+	aud_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable);
+	aud_cfg_db_close(cfg);
 }
 
 static void cleanup(void)
--- a/src/echo_plugin/gui.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/echo_plugin/gui.c	Thu Nov 01 15:38:07 2007 +0100
@@ -39,12 +39,12 @@
 	echo_surround_enable =
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(surround_btn));
 
-	cfg = bmp_cfg_db_open();
-	bmp_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay);
-	bmp_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback);
-	bmp_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume);
-	bmp_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable);
-	bmp_cfg_db_close(cfg);
+	cfg = aud_cfg_db_open();
+	aud_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay);
+	aud_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback);
+	aud_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume);
+	aud_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable);
+	aud_cfg_db_close(cfg);
 }
 
 static void conf_ok_cb(GtkButton * button, gpointer data)
--- a/src/esd/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/esd/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -53,15 +53,15 @@
     esd_cfg.prebuffer =
         gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_pre_spin));
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote);
-    bmp_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer);
-    bmp_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server);
-    bmp_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port);
-    bmp_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size);
-    bmp_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote);
+    aud_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer);
+    aud_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server);
+    aud_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port);
+    aud_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size);
+    aud_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer);
+    aud_cfg_db_close(db);
 
 }
 
--- a/src/esd/init.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/esd/init.c	Thu Nov 01 15:38:07 2007 +0100
@@ -41,7 +41,7 @@
     esd_cfg.buffer_size = 3000;
     esd_cfg.prebuffer = 25;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
     if ((env = getenv("ESPEAKER")) != NULL) {
         char *temp;
@@ -56,20 +56,20 @@
         }
     }
     else {
-        bmp_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote);
-        bmp_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server);
-        bmp_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port);
+        aud_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote);
+        aud_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server);
+        aud_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port);
     }
-    bmp_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer);
-    bmp_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size);
-    bmp_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer);
+    aud_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer);
+    aud_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size);
+    aud_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer);
     
     /* restore volume levels */
-    bmp_cfg_db_get_int(db, "ESD", "volume_left", &lp);
-    bmp_cfg_db_get_int(db, "ESD", "volume_right", &rp);
+    aud_cfg_db_get_int(db, "ESD", "volume_left", &lp);
+    aud_cfg_db_get_int(db, "ESD", "volume_right", &rp);
     esdout_set_volume(lp, rp);
     
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     if (!esd_cfg.server)
         esd_cfg.server = g_strdup("localhost");
--- a/src/esd/mixer.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/esd/mixer.c	Thu Nov 01 15:38:07 2007 +0100
@@ -160,10 +160,10 @@
     }
     
     /* save volume values in db */
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "ESD", "volume_left", lp);
-    bmp_cfg_db_set_int(db, "ESD", "volume_right", rp);
-    bmp_cfg_db_close(db);
+    db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "ESD", "volume_left", lp);
+    aud_cfg_db_set_int(db, "ESD", "volume_right", rp);
+    aud_cfg_db_close(db);
 }
 
 #ifdef HAVE_OSS
--- a/src/filewriter/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/filewriter/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -12,5 +12,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../../intl -I../..
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
--- a/src/filewriter/filewriter.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/filewriter/filewriter.c	Thu Nov 01 15:38:07 2007 +0100
@@ -136,14 +136,14 @@
 {
     ConfigDb *db;
 
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_get_int(db, "filewriter", "fileext", &fileext);
-    bmp_cfg_db_get_string(db, "filewriter", "file_path", &file_path);
-    bmp_cfg_db_get_bool(db, "filewriter", "save_original", &save_original);
-    bmp_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix);
-    bmp_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags);
-    bmp_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber);
-    bmp_cfg_db_close(db);
+    db = aud_cfg_db_open();
+    aud_cfg_db_get_int(db, "filewriter", "fileext", &fileext);
+    aud_cfg_db_get_string(db, "filewriter", "file_path", &file_path);
+    aud_cfg_db_get_bool(db, "filewriter", "save_original", &save_original);
+    aud_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix);
+    aud_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags);
+    aud_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber);
+    aud_cfg_db_close(db);
 
     if (!file_path)
         file_path = g_strdup(g_get_home_dir());
@@ -383,15 +383,15 @@
     prependnumber =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prependnumber_toggle));
 
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "filewriter", "fileext", fileext);
-    bmp_cfg_db_set_string(db, "filewriter", "file_path", file_path);
-    bmp_cfg_db_set_bool(db, "filewriter", "save_original", save_original);
-    bmp_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags);
-    bmp_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix);
-    bmp_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber);
+    db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "filewriter", "fileext", fileext);
+    aud_cfg_db_set_string(db, "filewriter", "file_path", file_path);
+    aud_cfg_db_set_bool(db, "filewriter", "save_original", save_original);
+    aud_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags);
+    aud_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix);
+    aud_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber);
 
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     gtk_widget_destroy(configure_win);
     if (path_dirbrowser)
--- a/src/filewriter/mp3.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/filewriter/mp3.c	Thu Nov 01 15:38:07 2007 +0100
@@ -160,40 +160,40 @@
 
 static void mp3_init(void)
 {
-    ConfigDb *db = bmp_cfg_db_open();
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val",
+    ConfigDb *db = aud_cfg_db_open();
+    aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val",
                        &enforce_min_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val",
                        &vbr_quality_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val",
                        &toggle_xing_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val",
                        &mark_original_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val",
                        &mark_copyright_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val",
                        &algo_quality_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val",
                        &out_samplerate_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val);
-    bmp_cfg_db_get_float(db, "filewriter_mp3", "compression_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val);
+    aud_cfg_db_get_float(db, "filewriter_mp3", "compression_val",
                          &compression_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val);
+    aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val",
                        &enforce_iso_val);
-    bmp_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val",
+    aud_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val",
                        &error_protect_val);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 }
 
 static gint mp3_open(void)
@@ -619,37 +619,37 @@
     if (vbr_min_val > vbr_max_val)
         vbr_max_val = vbr_min_val;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val",
                        mark_original_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val",
                        mark_copyright_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val",
                        algo_quality_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val",
                        out_samplerate_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val);
-    bmp_cfg_db_set_float(db, "filewriter_mp3", "compression_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val);
+    aud_cfg_db_set_float(db, "filewriter_mp3", "compression_val",
                          compression_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val);
-    bmp_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val",
+    aud_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val);
+    aud_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val",
                        error_protect_val);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
 
     gtk_widget_destroy(configure_win);
--- a/src/filewriter/vorbis.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/filewriter/vorbis.c	Thu Nov 01 15:38:07 2007 +0100
@@ -63,11 +63,11 @@
 
 static void vorbis_init(void)
 {
-    ConfigDb *db = bmp_cfg_db_open();
+    ConfigDb *db = aud_cfg_db_open();
 
-    bmp_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality);
+    aud_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality);
 
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 }
 
 static gint vorbis_open(void)
@@ -245,11 +245,11 @@
 
 static void configure_ok_cb(gpointer data)
 {
-    ConfigDb *db = bmp_cfg_db_open();
+    ConfigDb *db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality);
+    aud_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality);
 
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     gtk_widget_hide(configure_win);
 }
--- a/src/flacng/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/flacng/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -12,4 +12,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/flacng/tools.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/flacng/tools.c	Thu Nov 01 15:38:07 2007 +0100
@@ -242,7 +242,7 @@
     out = aud_tuple_new_from_filename(filename);
 
     aud_tuple_associate_string(out, FIELD_CODEC, NULL, "Free Lossless Audio Codec (FLAC)");
-    aud_tuple_associate_string(out, FIELD_CODEC, NULL, "lossless");
+    aud_tuple_associate_string(out, FIELD_QUALITY, NULL, "lossless");
 
     aud_tuple_associate_string(out, FIELD_ARTIST, NULL, info->comment.artist);
     aud_tuple_associate_string(out, FIELD_TITLE, NULL, info->comment.title);
--- a/src/gnomeshortcuts/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/gnomeshortcuts/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
+LIBS += ${GLIB_LIBS} ${DBUS_LIBS} ${GTK_LIBS}
--- a/src/gnomeshortcuts/gnomeshortcuts.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/gnomeshortcuts/gnomeshortcuts.c	Thu Nov 01 15:38:07 2007 +0100
@@ -21,6 +21,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define DBUS_API_SUBJECT_TO_CHANGE
+
 #include <config.h>
 
 #include <string.h>
--- a/src/hotkey/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/hotkey/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
+LIBS += ${GLIB_LIBS} ${DBUS_LIBS} ${GTK_LIBS}
--- a/src/hotkey/plugin.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/hotkey/plugin.c	Thu Nov 01 15:38:07 2007 +0100
@@ -447,34 +447,34 @@
 	plugin_cfg.toggle_win_mask = 0;
 
 	/* open configuration database */
-	cfdb = bmp_cfg_db_open ( );
+	cfdb = aud_cfg_db_open ( );
 
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win);
-	bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win);
+	aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask);
 
-	bmp_cfg_db_close (cfdb);
+	aud_cfg_db_close (cfdb);
 }
 
 /* save plugin configuration */
@@ -483,33 +483,33 @@
 	ConfigDb *cfdb;
 	
 	/* open configuration database */
-	cfdb = bmp_cfg_db_open ( );
+	cfdb = aud_cfg_db_open ( );
 	
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask);	
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win);
-	bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask);
-	bmp_cfg_db_close (cfdb);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask);	
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win);
+	aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask);
+	aud_cfg_db_close (cfdb);
 }
 
 static int x11_error_handler (Display *dpy, XErrorEvent *error)
--- a/src/jack/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/jack/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -53,11 +53,11 @@
 
   jack_set_port_connection_mode(); /* update the connection mode */
 
-	cfgfile = bmp_cfg_db_open();
+	cfgfile = aud_cfg_db_open();
 
-	bmp_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled);
-	bmp_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode);
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled);
+	aud_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode);
+	aud_cfg_db_close(cfgfile);
 
 	gtk_widget_destroy(configure_win);
 }
--- a/src/jack/jack.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/jack/jack.c	Thu Nov 01 15:38:07 2007 +0100
@@ -6,6 +6,7 @@
  *	This code maps xmms calls into the jack translation library
  */
 
+#include <audacious/plugin.h>
 #include <audacious/configdb.h>
 #include <audacious/util.h>
 #include <dlfcn.h>
@@ -15,7 +16,6 @@
 #include "config.h"
 #include "bio2jack.h" /* includes for the bio2jack library */
 #include "jack.h"
-#include "xconvert.h" /* xmms rate conversion header file */
 #include <string.h>
 
 
@@ -58,12 +58,6 @@
 static convert_freq_func_t freq_convert; /* rate convert function */
 static struct xmms_convert_buffers *convertb; /* convert buffer */
 
-#define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
-MAKE_FUNCPTR(xmms_convert_buffers_new);
-MAKE_FUNCPTR(xmms_convert_buffers_destroy);
-MAKE_FUNCPTR(xmms_convert_get_frequency_func);
-void *xmmslibhandle; /* handle to the dlopen'ed libxmms.so */
-
 static int isXmmsFrequencyAvailable = 0;
 
 static gboolean output_opened; /* true if we have a connection to jack */
@@ -88,8 +82,7 @@
   /* only clean this up if we have the function to call */
   if(isXmmsFrequencyAvailable)
   {
-    fp_xmms_convert_buffers_destroy(convertb); /* clean up the rate conversion buffers */
-    dlclose(xmmslibhandle);
+    aud_convert_buffers_destroy(convertb); /* clean up the rate conversion buffers */
   }
 
   return;
@@ -203,7 +196,7 @@
   /* read the isTraceEnabled setting from the config file */
   ConfigDb *cfgfile;
 
-  cfgfile = bmp_cfg_db_open();
+  cfgfile = aud_cfg_db_open();
   if (!cfgfile)
   {
       jack_cfg.isTraceEnabled = FALSE;
@@ -212,16 +205,16 @@
       jack_cfg.volume_right = 25;
   } else
   {
-      bmp_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled);
-      if(!bmp_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode))
+      aud_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled);
+      if(!aud_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode))
           jack_cfg.port_connection_mode = "CONNECT_ALL";
-      if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left))
+      if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left))
           jack_cfg.volume_left = 25;
-      if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right))
+      if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right))
           jack_cfg.volume_right = 25;
   }
 
-  bmp_cfg_db_close(cfgfile);
+  aud_cfg_db_close(cfgfile);
 
 
   TRACE("initializing\n");
@@ -234,52 +227,13 @@
   /* set the port connection mode */
   jack_set_port_connection_mode();
 
-  /* XXX unportable to 2.x */
-  xmmslibhandle = dlopen("libaudacious.so", RTLD_NOW);
-  if(xmmslibhandle)
-  {
-    fp_xmms_convert_buffers_new = dlsym(xmmslibhandle, "xmms_convert_buffers_new");
-    fp_xmms_convert_buffers_destroy = dlsym(xmmslibhandle, "xmms_convert_buffers_destroy");
-    fp_xmms_convert_get_frequency_func = dlsym(xmmslibhandle, "xmms_convert_get_frequency_func");
-
-    if(!fp_xmms_convert_buffers_new)
-    {
-      TRACE("fp_xmms_convert_buffers_new couldn't be dlsym'ed\n");
-      TRACE("dlerror: %s\n", dlerror());
-    }
-
-    if(!fp_xmms_convert_buffers_destroy)
-    {
-      TRACE("fp_xmms_convert_buffers_destroy couldn't be dlsym'ed\n");
-      TRACE("dlerror: %s\n", dlerror());
-    }
-
-    if(!fp_xmms_convert_get_frequency_func)
-    {
-      TRACE("fp_xmms_get_frequency_func couldn't be dlsym'ed\n");
-      TRACE("dlerror: %s\n", dlerror());
-    }
-
-    if(!fp_xmms_convert_buffers_new || !fp_xmms_convert_buffers_destroy ||
-       !fp_xmms_convert_get_frequency_func)
-    {
-      dlclose(xmmslibhandle); /* close the library, no need to keep it open */
-      TRACE("One or more frequency convertion functions are missing, upgrade to xmms >=1.2.8\n");
-    } else
-    {
-      TRACE("Found frequency convertion functions, setting isXmmsFrequencyAvailable to 1\n");
-      isXmmsFrequencyAvailable = 1;
-    }
-  } else
-  {
-    TRACE("unable to dlopen '%s'\n", "libaudacious.so");
-  }
+  isXmmsFrequencyAvailable = 1;
 
   /* only initialize this stuff if we have the functions available */
   if(isXmmsFrequencyAvailable)
   {
-    convertb = fp_xmms_convert_buffers_new ();
-    freq_convert = fp_xmms_convert_get_frequency_func(FMT_S16_LE, 2);
+    convertb = aud_convert_buffers_new ();
+    freq_convert = aud_convert_get_frequency_func(FMT_S16_LE, 2);
   }
 
   output_opened = FALSE;
@@ -320,10 +274,10 @@
 {
   ConfigDb *cfgfile;
 
-  cfgfile = bmp_cfg_db_open();
-  bmp_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */
-  bmp_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right);
-  bmp_cfg_db_close(cfgfile);
+  cfgfile = aud_cfg_db_open();
+  aud_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */
+  aud_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right);
+  aud_cfg_db_close(cfgfile);
 
   TRACE("\n");
 
--- a/src/jack/xconvert.h	Thu Nov 01 15:37:43 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- *  Copyright (C) 2003  Haavard Kvaalen <havardk@xmms.org>
- *
- *  Licensed under GNU LGPL version 2.
- */
-
-
-
-#include <audacious/plugin.h>
-
-void convert_free_buffer(void);
-
-struct xmms_convert_buffers;
-
-struct xmms_convert_buffers* xmms_convert_buffers_new(void);
-/*
- * Free the data assosiated with the buffers, without destroying the
- * context.  The context can be reused.
- */
-void xmms_convert_buffers_free(struct xmms_convert_buffers* buf);
-void xmms_convert_buffers_destroy(struct xmms_convert_buffers* buf);
-
-
-typedef int (*convert_func_t)(struct xmms_convert_buffers* buf, void **data, int length);
-typedef int (*convert_channel_func_t)(struct xmms_convert_buffers* buf, void **data, int length);
-typedef int (*convert_freq_func_t)(struct xmms_convert_buffers* buf, void **data, int length, int ifreq, int ofreq);
-
-
-convert_func_t xmms_convert_get_func(AFormat output, AFormat input);
-convert_channel_func_t xmms_convert_get_channel_func(AFormat fmt, int output, int input);
-convert_freq_func_t xmms_convert_get_frequency_func(AFormat fmt, int channels);
--- a/src/ladspa/ladspa.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/ladspa/ladspa.c	Thu Nov 01 15:38:07 2007 +0100
@@ -144,29 +144,29 @@
   ConfigDb *db;
   gint k, plugins= 0;
 
-  db = bmp_cfg_db_open();
+  db = aud_cfg_db_open();
 
-  bmp_cfg_db_get_int(db, "ladspa", "plugins", &plugins);
+  aud_cfg_db_get_int(db, "ladspa", "plugins", &plugins);
   for (k= 0; k < plugins; ++k) {
     gint id;
     int port, ports= 0;
     plugin_instance *instance;
     gchar *section = g_strdup_printf("ladspa_plugin%d", k);
 
-    bmp_cfg_db_get_int(db, section, "id", &id);
+    aud_cfg_db_get_int(db, section, "id", &id);
     instance = add_plugin(get_plugin_by_id(id));
     if (!instance) continue; /* couldn't load this plugin */
-    bmp_cfg_db_get_int(db, section, "ports", &ports);
+    aud_cfg_db_get_int(db, section, "ports", &ports);
     for (port= 0; port < ports && port < MAX_KNOBS; ++port) {
       gchar *key = g_strdup_printf("port%d", port);
-      bmp_cfg_db_get_float(db, section, key, &(instance->knobs[port]));
+      aud_cfg_db_get_float(db, section, key, &(instance->knobs[port]));
     }
     instance->restored = TRUE;
     g_free(section);
   }
 
   state.initialised = TRUE;
-  bmp_cfg_db_close(db);
+  aud_cfg_db_close(db);
 }
 
 static ladspa_plugin *get_plugin_by_id(long id)
@@ -261,33 +261,33 @@
     return;
   }
   state.running = FALSE;
-  db = bmp_cfg_db_open();
+  db = aud_cfg_db_open();
   G_LOCK (running_plugins);
   for (list= running_plugins; list != NULL; list = g_slist_next(list)) {
     plugin_instance *instance = (plugin_instance *) list->data;
     gchar *section = g_strdup_printf("ladspa_plugin%d", plugins++);
     int port, ports= 0;
 
-    bmp_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID);
-    bmp_cfg_db_set_string(db, section, "file", instance->filename);
-    bmp_cfg_db_set_string(db, section, "label", (gchar *)
+    aud_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID);
+    aud_cfg_db_set_string(db, section, "file", instance->filename);
+    aud_cfg_db_set_string(db, section, "label", (gchar *)
                                               instance->descriptor->Label);
 
     ports = instance->descriptor->PortCount;
     if (ports > MAX_KNOBS) ports = MAX_KNOBS;
     for (port= 0; port < ports; ++port) {
       gchar *key = g_strdup_printf("port%d", port);
-      bmp_cfg_db_set_float(db, section, key, instance->knobs[port]);
+      aud_cfg_db_set_float(db, section, key, instance->knobs[port]);
       g_free(key);
     }
-    bmp_cfg_db_set_int(db, section, "ports", ports);
+    aud_cfg_db_set_int(db, section, "ports", ports);
     g_free(section);
     ladspa_shutdown (instance);
   }
   G_UNLOCK (running_plugins);
 
-  bmp_cfg_db_set_int(db, "ladspa", "plugins", plugins);
-  bmp_cfg_db_close(db);
+  aud_cfg_db_set_int(db, "ladspa", "plugins", plugins);
+  aud_cfg_db_close(db);
 }
 
 static void ladspa_shutdown (plugin_instance *instance)
--- a/src/lastfm/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/lastfm/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS} ${MOWGLI_LIBS}
--- a/src/lastfm/lastfm.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/lastfm/lastfm.c	Thu Nov 01 15:38:07 2007 +0100
@@ -112,11 +112,11 @@
         gchar   *buf=NULL,
                 *username = NULL, 
                 *password = NULL;
-        if ((cfg = bmp_cfg_db_open()) != NULL)
+        if ((cfg = aud_cfg_db_open()) != NULL)
         {
-                bmp_cfg_db_get_string(cfg, "audioscrobbler","username",
+                aud_cfg_db_get_string(cfg, "audioscrobbler","username",
                                 &username);
-                bmp_cfg_db_get_string(cfg, "audioscrobbler","password",
+                aud_cfg_db_get_string(cfg, "audioscrobbler","password",
                                 &password);
                 g_free(cfg);
         }
@@ -537,7 +537,7 @@
 
 off_t lastfm_aud_vfs_fsize_impl(VFSFile * file)
 {
-        return 0;
+        return -1;
 }
 
 gchar *lastfm_aud_vfs_metadata_impl(VFSFile * file, const gchar * field)
--- a/src/madplug/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/madplug/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -15,5 +15,6 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
-LIBS += -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
+LDFLAGS += ${AUDLDFLAGS}
+LIBS += ${MAD_LIBS} -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/madplug/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/madplug/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -77,35 +77,35 @@
 
     audmad_config_compute(&audmad_config);
 
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_set_int(db, "MAD", "http_buffer_size",
+    db = aud_cfg_db_open();
+    aud_cfg_db_set_int(db, "MAD", "http_buffer_size",
                        audmad_config.http_buffer_size);
-    bmp_cfg_db_set_bool(db, "MAD", "fast_play_time_calc",
+    aud_cfg_db_set_bool(db, "MAD", "fast_play_time_calc",
                         audmad_config.fast_play_time_calc);
-    bmp_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing);
-    bmp_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither);
-    bmp_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis);
-    bmp_cfg_db_set_bool(db, "MAD", "hard_limit",
+    aud_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing);
+    aud_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither);
+    aud_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis);
+    aud_cfg_db_set_bool(db, "MAD", "hard_limit",
                         audmad_config.hard_limit);
-    bmp_cfg_db_set_string(db, "MAD", "pregain_db",
+    aud_cfg_db_set_string(db, "MAD", "pregain_db",
                           audmad_config.pregain_db);
 
-    bmp_cfg_db_set_bool(db, "MAD", "RG.enable",
+    aud_cfg_db_set_bool(db, "MAD", "RG.enable",
                         audmad_config.replaygain.enable);
-    bmp_cfg_db_set_bool(db, "MAD", "RG.track_mode",
+    aud_cfg_db_set_bool(db, "MAD", "RG.track_mode",
                         audmad_config.replaygain.track_mode);
-    bmp_cfg_db_set_string(db, "MAD", "RG.default_db",
+    aud_cfg_db_set_string(db, "MAD", "RG.default_db",
                           audmad_config.replaygain.default_db);
 
-    bmp_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override);
-    bmp_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format);
+    aud_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override);
+    aud_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format);
 
-    bmp_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate",
+    aud_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate",
                             audmad_config.show_avg_vbr_bitrate);
-    bmp_cfg_db_set_bool(db, "MAD", "force_reopen_audio",
+    aud_cfg_db_set_bool(db, "MAD", "force_reopen_audio",
                             audmad_config.force_reopen_audio);
 
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
     gtk_widget_destroy(configure_win);
 }
 
--- a/src/madplug/input.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/madplug/input.c	Thu Nov 01 15:38:07 2007 +0100
@@ -483,7 +483,7 @@
         }
 
         if (metadata)
-            tmp = aud_tuple_formatter_process_string(info->tuple, "${?title:${title}}${?stream: (${stream})");
+            tmp = aud_tuple_formatter_process_string(info->tuple, "${?title:${title}}${?stream: (${stream})}");
         else {
             gchar *realfn = g_filename_from_uri(info->filename, NULL, NULL);
             gchar *tmp2 = g_path_get_basename(realfn ? realfn : info->filename); // info->filename is uri. --yaz
--- a/src/madplug/plugin.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/madplug/plugin.c	Thu Nov 01 15:38:07 2007 +0100
@@ -131,34 +131,34 @@
     audmad_config.show_avg_vbr_bitrate = TRUE;
     audmad_config.force_reopen_audio = FALSE;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
     if (db) {
-        bmp_cfg_db_get_bool(db, "MAD", "fast_play_time_calc",
+        aud_cfg_db_get_bool(db, "MAD", "fast_play_time_calc",
                             &audmad_config.fast_play_time_calc);
-        bmp_cfg_db_get_bool(db, "MAD", "use_xing",
+        aud_cfg_db_get_bool(db, "MAD", "use_xing",
                             &audmad_config.use_xing);
-        bmp_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither);
-        bmp_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis);
-        bmp_cfg_db_get_bool(db, "MAD", "hard_limit",
+        aud_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither);
+        aud_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis);
+        aud_cfg_db_get_bool(db, "MAD", "hard_limit",
                             &audmad_config.hard_limit);
-        bmp_cfg_db_get_string(db, "MAD", "pregain_db",
+        aud_cfg_db_get_string(db, "MAD", "pregain_db",
                               &audmad_config.pregain_db);
-        bmp_cfg_db_get_bool(db, "MAD", "RG.enable",
+        aud_cfg_db_get_bool(db, "MAD", "RG.enable",
                             &audmad_config.replaygain.enable);
-        bmp_cfg_db_get_bool(db, "MAD", "RG.track_mode",
+        aud_cfg_db_get_bool(db, "MAD", "RG.track_mode",
                             &audmad_config.replaygain.track_mode);
-        bmp_cfg_db_get_string(db, "MAD", "RG.default_db",
+        aud_cfg_db_get_string(db, "MAD", "RG.default_db",
                               &audmad_config.replaygain.default_db);
-        bmp_cfg_db_get_bool(db, "MAD", "title_override",
+        aud_cfg_db_get_bool(db, "MAD", "title_override",
                             &audmad_config.title_override);
-        bmp_cfg_db_get_string(db, "MAD", "id3_format",
+        aud_cfg_db_get_string(db, "MAD", "id3_format",
                               &audmad_config.id3_format);
-        bmp_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate",
+        aud_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate",
                             &audmad_config.show_avg_vbr_bitrate);
-        bmp_cfg_db_get_bool(db, "MAD", "force_reopen_audio",
+        aud_cfg_db_get_bool(db, "MAD", "force_reopen_audio",
                             &audmad_config.force_reopen_audio);
 
-        bmp_cfg_db_close(db);
+        aud_cfg_db_close(db);
     }
 
     mad_mutex = g_mutex_new();
--- a/src/modplug/gui/interface.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/modplug/gui/interface.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -129,7 +129,7 @@
 
   Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (Config, "Config");
-  gtk_widget_set_size_request (Config, 500, -1);
+  gtk_widget_set_size_request (Config, -1, -1);
   gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));
   gtk_window_set_resizable (GTK_WINDOW (Config), FALSE);
 
--- a/src/modplug/gui/main.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/modplug/gui/main.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -41,12 +41,15 @@
 {
 	if(!AboutWin)
 	{
-		gchar * about_text = g_strjoin( "" , _("Modplug Input Plugin for Audacious ver") ,
-				VERSION , _("\nModplug sound engine written by Olivier Lapicque.\nXMMS interface for Modplug by Kenton Varda.\n(c)2000 Olivier Lapicque and Kenton Varda.\nUpdates and Maintainance by Konstanty Bialkowski.\nPorted to BMP by Theofilos Intzoglou.") , NULL );
-		AboutWin = audacious_info_dialog( _("About Modplug") , about_text , _("Ok") , FALSE , NULL , NULL );
-		gtk_signal_connect( GTK_OBJECT(AboutWin) , "destroy" ,
+		gchar * about_text = g_strjoin("",
+			_("Modplug Input Plugin for Audacious ver"), VERSION,
+			_("\nModplug sound engine written by Olivier Lapicque.\nXMMS interface for Modplug by Kenton Varda.\n(c)2000 Olivier Lapicque and Kenton Varda.\nUpdates and Maintainance by Konstanty Bialkowski.\nPorted to BMP by Theofilos Intzoglou."),
+			NULL);
+		
+		AboutWin = audacious_info_dialog(_("About Modplug"), about_text, _("Ok"), FALSE, NULL, NULL);
+		gtk_signal_connect(GTK_OBJECT(AboutWin), "destroy",
 			GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AboutWin);
-		g_free( about_text );
+		g_free(about_text);
 	}
 	gtk_widget_show(AboutWin);
 }
@@ -179,7 +182,7 @@
 
 	lInfo = lShortFN;
 	lInfo += '\n';
-	tmps = aud_str_to_utf8(lSoundFile->GetTitle());
+	tmps = MODPLUG_CONVERT(lSoundFile->GetTitle());
 	lInfo += tmps;
 	g_free(tmps);
 	lInfo += '\n';
@@ -279,7 +282,7 @@
 	for(i = 0; i < lNumSamples; i++)
 	{
 		lSoundFile->GetSampleName(i, lBuffer);
-		tmps = aud_str_to_utf8(lBuffer);
+		tmps = MODPLUG_CONVERT(lBuffer);
 		lInfo += tmps;
 		g_free(tmps);
 		lInfo += '\n';
@@ -290,7 +293,7 @@
 	for(i = 0; i < lNumInstruments; i++)
 	{
 		lSoundFile->GetInstrumentName(i, lBuffer);
-		tmps = aud_str_to_utf8(lBuffer);
+		tmps = MODPLUG_CONVERT(lBuffer);
 		lInfo += tmps;
 		g_free(tmps);
 		lInfo += '\n';
@@ -304,7 +307,7 @@
 	//gtk_text_backward_delete(textbox, length);
 	length = lSoundFile->GetSongComments(message, MAX_MESSAGE_LENGTH, 80);
 	if (length != 0) {
-		tmps = aud_str_to_utf8(message);
+		tmps = MODPLUG_CONVERT(message);
 		gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_message"), tmps);
 		g_free(tmps);
 	}
--- a/src/modplug/modplugbmp.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/modplug/modplugbmp.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -76,32 +76,32 @@
 {
 	ConfigDb *db;
 	
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
-	bmp_cfg_db_get_bool(db,"modplug","Surround", &mModProps.mSurround);
-        bmp_cfg_db_get_bool(db,"modplug","Oversampling", &mModProps.mOversamp);
-        bmp_cfg_db_get_bool(db,"modplug","Megabass", &mModProps.mMegabass);
-        bmp_cfg_db_get_bool(db,"modplug","NoiseReduction", &mModProps.mNoiseReduction);
-        bmp_cfg_db_get_bool(db,"modplug","VolumeRamp", &mModProps.mVolumeRamp);
-        bmp_cfg_db_get_bool(db,"modplug","Reverb", &mModProps.mReverb);
-        bmp_cfg_db_get_bool(db,"modplug","FastInfo", &mModProps.mFastinfo);
-        bmp_cfg_db_get_bool(db,"modplug","UseFileName", &mModProps.mUseFilename);
-        bmp_cfg_db_get_bool(db,"modplug","GrabAmigaMOD", &mModProps.mGrabAmigaMOD);
-        bmp_cfg_db_get_bool(db,"modplug","PreAmp", &mModProps.mPreamp);
-        bmp_cfg_db_get_float(db,"modplug","PreAmpLevel", &mModProps.mPreampLevel);
-        bmp_cfg_db_get_int(db,"modplug", "Channels", &mModProps.mChannels);
-        bmp_cfg_db_get_int(db,"modplug", "Bits", &mModProps.mBits);
-        bmp_cfg_db_get_int(db,"modplug", "Frequency", &mModProps.mFrequency);
-        bmp_cfg_db_get_int(db,"modplug", "ResamplineMode", &mModProps.mResamplingMode);
-        bmp_cfg_db_get_int(db,"modplug", "ReverbDepth", &mModProps.mReverbDepth);
-        bmp_cfg_db_get_int(db,"modplug", "ReverbDelay", &mModProps.mReverbDelay);
-        bmp_cfg_db_get_int(db,"modplug", "BassAmount", &mModProps.mBassAmount);
-        bmp_cfg_db_get_int(db,"modplug", "BassRange", &mModProps.mBassRange);
-        bmp_cfg_db_get_int(db,"modplug", "SurroundDepth", &mModProps.mSurroundDepth);
-        bmp_cfg_db_get_int(db,"modplug", "SurroundDelay", &mModProps.mSurroundDelay);
-        bmp_cfg_db_get_int(db,"modplug", "LoopCount", &mModProps.mLoopCount);
+	aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Surround", &mModProps.mSurround);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Oversampling", &mModProps.mOversamp);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Megabass", &mModProps.mMegabass);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"NoiseReduction", &mModProps.mNoiseReduction);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"VolumeRamp", &mModProps.mVolumeRamp);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Reverb", &mModProps.mReverb);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"FastInfo", &mModProps.mFastinfo);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"UseFileName", &mModProps.mUseFilename);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", &mModProps.mGrabAmigaMOD);
+        aud_cfg_db_get_bool(db, MODPLUG_CFGID,"PreAmp", &mModProps.mPreamp);
+        aud_cfg_db_get_float(db, MODPLUG_CFGID,"PreAmpLevel", &mModProps.mPreampLevel);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "Channels", &mModProps.mChannels);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "Bits", &mModProps.mBits);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "Frequency", &mModProps.mFrequency);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "ResamplineMode", &mModProps.mResamplingMode);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDepth", &mModProps.mReverbDepth);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDelay", &mModProps.mReverbDelay);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassAmount", &mModProps.mBassAmount);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassRange", &mModProps.mBassRange);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDepth", &mModProps.mSurroundDepth);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDelay", &mModProps.mSurroundDelay);
+        aud_cfg_db_get_int(db, MODPLUG_CFGID, "LoopCount", &mModProps.mLoopCount);
 
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 bool ModplugXMMS::CanPlayFileFromVFS(const string& aFilename, VFSFile *file)
@@ -504,7 +504,7 @@
 {
 	CSoundFile* lSoundFile;
 	Archive* lArchive;
-	std::string tmps;
+	const gchar *tmps;
 	
 	//open and mmap the file
         lArchive = OpenArchive(aFilename);
@@ -543,15 +543,11 @@
 	case MOD_TYPE_PSM:	tmps = "Protracker Studio Module"; break;
 	default:		tmps = "ModPlug unknown"; break;
 	}
-	aud_tuple_associate_string(ti, FIELD_CODEC, NULL, tmps.c_str());
+	aud_tuple_associate_string(ti, FIELD_CODEC, NULL, tmps);
 	aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
 	aud_tuple_associate_int(ti, FIELD_LENGTH, NULL, lSoundFile->GetSongTime() * 1000);
-
-	/* NOTICE! FIXME? This is actually incorrect. We _cannot_ know what charset
-	 * an arbitrary module file uses .. typically it is some DOS CP-variant,
-	 * except for true Amiga modules.
-	 */
-	gchar *tmps2 = aud_str_to_utf8(lSoundFile->GetTitle());
+	
+	gchar *tmps2 = MODPLUG_CONVERT(lSoundFile->GetTitle());
 	aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmps2);
 	g_free(tmps2);
 	
@@ -637,32 +633,32 @@
 	CSoundFile::SetResamplingMode(mModProps.mResamplingMode);
 	mPreampFactor = exp(mModProps.mPreampLevel);
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
-	bmp_cfg_db_set_bool(db,"modplug","Surround", mModProps.mSurround);
-        bmp_cfg_db_set_bool(db,"modplug","Oversampling", mModProps.mOversamp);
-        bmp_cfg_db_set_bool(db,"modplug","Megabass", mModProps.mMegabass);
-        bmp_cfg_db_set_bool(db,"modplug","NoiseReduction", mModProps.mNoiseReduction);
-        bmp_cfg_db_set_bool(db,"modplug","VolumeRamp", mModProps.mVolumeRamp);
-        bmp_cfg_db_set_bool(db,"modplug","Reverb", mModProps.mReverb);
-        bmp_cfg_db_set_bool(db,"modplug","FastInfo", mModProps.mFastinfo);
-        bmp_cfg_db_set_bool(db,"modplug","UseFileName", mModProps.mUseFilename);
-        bmp_cfg_db_set_bool(db,"modplug","GrabAmigaMOD", mModProps.mGrabAmigaMOD);
-        bmp_cfg_db_set_bool(db,"modplug","PreAmp", mModProps.mPreamp);
-        bmp_cfg_db_set_float(db,"modplug","PreAmpLevel", mModProps.mPreampLevel);
-        bmp_cfg_db_set_int(db,"modplug", "Channels", mModProps.mChannels);
-        bmp_cfg_db_set_int(db,"modplug", "Bits", mModProps.mBits);
-        bmp_cfg_db_set_int(db,"modplug", "Frequency", mModProps.mFrequency);
-        bmp_cfg_db_set_int(db,"modplug", "ResamplineMode", mModProps.mResamplingMode);
-        bmp_cfg_db_set_int(db,"modplug", "ReverbDepth", mModProps.mReverbDepth);
-        bmp_cfg_db_set_int(db,"modplug", "ReverbDelay", mModProps.mReverbDelay);
-        bmp_cfg_db_set_int(db,"modplug", "BassAmount", mModProps.mBassAmount);
-        bmp_cfg_db_set_int(db,"modplug", "BassRange", mModProps.mBassRange);
-        bmp_cfg_db_set_int(db,"modplug", "SurroundDepth", mModProps.mSurroundDepth);
-        bmp_cfg_db_set_int(db,"modplug", "SurroundDelay", mModProps.mSurroundDelay);
-        bmp_cfg_db_set_int(db,"modplug", "LoopCount", mModProps.mLoopCount);
+	aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Surround", mModProps.mSurround);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Oversampling", mModProps.mOversamp);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Megabass", mModProps.mMegabass);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"NoiseReduction", mModProps.mNoiseReduction);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"VolumeRamp", mModProps.mVolumeRamp);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Reverb", mModProps.mReverb);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"FastInfo", mModProps.mFastinfo);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"UseFileName", mModProps.mUseFilename);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", mModProps.mGrabAmigaMOD);
+        aud_cfg_db_set_bool(db, MODPLUG_CFGID,"PreAmp", mModProps.mPreamp);
+        aud_cfg_db_set_float(db, MODPLUG_CFGID,"PreAmpLevel", mModProps.mPreampLevel);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "Channels", mModProps.mChannels);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "Bits", mModProps.mBits);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "Frequency", mModProps.mFrequency);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "ResamplineMode", mModProps.mResamplingMode);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDepth", mModProps.mReverbDepth);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDelay", mModProps.mReverbDelay);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassAmount", mModProps.mBassAmount);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassRange", mModProps.mBassRange);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDepth", mModProps.mSurroundDepth);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDelay", mModProps.mSurroundDelay);
+        aud_cfg_db_set_int(db, MODPLUG_CFGID, "LoopCount", mModProps.mLoopCount);
 
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 ModplugXMMS gModplugXMMS;
--- a/src/modplug/sndfile.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/modplug/sndfile.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -174,12 +174,7 @@
 		LPSTR p = m_szNames[i];
 		int j = 31;
 		p[j] = 0;
-		while ((j>=0) && (p[j]<=' ')) p[j--] = 0;
-		while (j>=0)
-		{
-			if (((BYTE)p[j]) < ' ') p[j] = ' ';
-			j--;
-		}
+		while ((j >= 0) && (p[j] == ' ')) p[j--] = 0;
 	}
 	// Adjust channels
 	for (i=0; i<MAX_BASECHANNELS; i++)
--- a/src/modplug/stddefs.h	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/modplug/stddefs.h	Thu Nov 01 15:38:07 2007 +0100
@@ -11,6 +11,11 @@
 #if !defined(__MODPLUGXMMS_STDDEFS_H__INCLUDED__)
 #define __MODPLUGXMMS_STDDEFS_H__INCLUDED__
 
+#include <glib.h>
+
+#define MODPLUG_CFGID		"modplug"
+#define MODPLUG_CONVERT(X)	g_convert(X, -1, "UTF-8", "CP850", NULL, NULL, NULL)
+
 //Invalid pointer
 #ifndef NULL
 #define NULL 0
@@ -21,17 +26,17 @@
 // platforms.  For example, long is 64-bit on some 64-bit systems.
 //u = unsigned
 //# = size in bits
-typedef unsigned char          uchar;
+typedef guchar                 uchar;
 
-typedef char                   int8;
-typedef short                  int16;
-typedef int                    int32;
-typedef long long              int64;
+typedef gint8                  int8;
+typedef gint16                 int16;
+typedef gint32                 int32;
+typedef gint64                 int64;
 
-typedef unsigned char          uint8;
-typedef unsigned short         uint16;
-typedef unsigned int           uint32;
-typedef unsigned long long     uint64;
+typedef guint8                 uint8;
+typedef guint16                uint16;
+typedef guint32                uint32;
+typedef guint64                uint64;
 
 typedef float                  float32;
 typedef double                 float64;
--- a/src/musepack/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/musepack/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -9,4 +9,4 @@
 
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${TAGLIB_CFLAGS} -I../../intl -I../..
-LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lmpcdec
+LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lmpcdec
--- a/src/musepack/libmpc.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/musepack/libmpc.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -128,12 +128,12 @@
 static void mpcOpenPlugin()
 {
     ConfigDb *cfg;
-    cfg = bmp_cfg_db_open();
-    bmp_cfg_db_get_bool(cfg, "musepack", "clipPrevention", &pluginConfig.clipPrevention);
-    bmp_cfg_db_get_bool(cfg, "musepack", "albumGain",      &pluginConfig.albumGain);
-    bmp_cfg_db_get_bool(cfg, "musepack", "dynamicBitrate", &pluginConfig.dynamicBitrate);
-    bmp_cfg_db_get_bool(cfg, "musepack", "replaygain",     &pluginConfig.replaygain);
-    bmp_cfg_db_close(cfg);
+    cfg = aud_cfg_db_open();
+    aud_cfg_db_get_bool(cfg, "musepack", "clipPrevention", &pluginConfig.clipPrevention);
+    aud_cfg_db_get_bool(cfg, "musepack", "albumGain",      &pluginConfig.albumGain);
+    aud_cfg_db_get_bool(cfg, "musepack", "dynamicBitrate", &pluginConfig.dynamicBitrate);
+    aud_cfg_db_get_bool(cfg, "musepack", "replaygain",     &pluginConfig.replaygain);
+    aud_cfg_db_close(cfg);
 }
 
 static void mpcAboutBox()
@@ -263,19 +263,19 @@
     tb = GTK_TOGGLE_BUTTON(widgets.albumCheck);
     pluginConfig.albumGain = gtk_toggle_button_get_active(tb);
 
-    cfg = bmp_cfg_db_open();
+    cfg = aud_cfg_db_open();
 
-    bmp_cfg_db_set_bool(cfg, "musepack", "clipPrevention", pluginConfig.clipPrevention);
-    bmp_cfg_db_set_bool(cfg, "musepack", "albumGain",      pluginConfig.albumGain);
-    bmp_cfg_db_set_bool(cfg, "musepack", "dynamicBitrate", pluginConfig.dynamicBitrate);
-    bmp_cfg_db_set_bool(cfg, "musepack", "replaygain",     pluginConfig.replaygain);
+    aud_cfg_db_set_bool(cfg, "musepack", "clipPrevention", pluginConfig.clipPrevention);
+    aud_cfg_db_set_bool(cfg, "musepack", "albumGain",      pluginConfig.albumGain);
+    aud_cfg_db_set_bool(cfg, "musepack", "dynamicBitrate", pluginConfig.dynamicBitrate);
+    aud_cfg_db_set_bool(cfg, "musepack", "replaygain",     pluginConfig.replaygain);
 
-    bmp_cfg_db_close(cfg);
+    aud_cfg_db_close(cfg);
 
     gtk_widget_destroy (widgets.configBox);
 }
 
-static int mpcIsOurFile(char* p_Filename)
+static gint mpcIsOurFile(gchar* p_Filename)
 {
     VFSFile *file;
     gchar magic[3];
@@ -290,7 +290,7 @@
     return 0;
 }
 
-static int mpcIsOurFD(char* p_Filename, VFSFile* file)
+static gint mpcIsOurFD(gchar* p_Filename, VFSFile* file)
 {
     gchar magic[3];
     aud_vfs_fread(magic, 1, 3, file);
@@ -341,14 +341,14 @@
     lockRelease();
 }
 
-static int mpcGetTime(InputPlayback *data)
+static gint mpcGetTime(InputPlayback *data)
 {
     if(!isAlive())
         return -1;
     return data->output->output_time();
 }
 
-static Tuple *mpcGetSongTuple(char* p_Filename)
+static Tuple *mpcGetSongTuple(gchar* p_Filename)
 {
     VFSFile *input = aud_vfs_fopen(p_Filename, "rb");
     Tuple *tuple = NULL;
@@ -389,9 +389,9 @@
     }
     else
     {
-        char* temp = g_strdup_printf("[xmms-musepack] mpcGetSongInfo is unable to open %s\n", p_Filename);
+        gchar* temp = g_strdup_printf("[xmms-musepack] mpcGetSongInfo is unable to open %s\n", p_Filename);
         perror(temp);
-        free(temp);
+        g_free(temp);
     }
 
     return tuple;
@@ -414,23 +414,23 @@
     }
     else
     {
-        char* temp = g_strdup_printf("[xmms-musepack] mpcGetSongInfo is unable to open %s\n", p_Filename);
+        gchar* temp = g_strdup_printf("[xmms-musepack] mpcGetSongInfo is unable to open %s\n", p_Filename);
         perror(temp);
-        free(temp);
+        g_free(temp);
     }
 }
 
 static void freeTags(MpcInfo& tags)
 {
-    free(tags.title);
-    free(tags.artist);
-    free(tags.album);
-    free(tags.comment);
-    free(tags.genre);
-    free(tags.date);
+    g_free(tags.title);
+    g_free(tags.artist);
+    g_free(tags.album);
+    g_free(tags.comment);
+    g_free(tags.genre);
+    g_free(tags.date);
 }
 
-static MpcInfo getTags(const char* p_Filename)
+static MpcInfo getTags(const gchar* p_Filename)
 {
     gchar *pRealFilename = g_filename_from_uri(p_Filename, NULL, NULL);
     File oFile(pRealFilename ? pRealFilename : p_Filename, false);
@@ -588,9 +588,9 @@
             mpc_reader_setup_file_vfs(&reader, input);
             mpc_streaminfo_read(&info, &reader.reader);
 
-            int time = static_cast<int> (mpc_streaminfo_get_length(&info));
-            int minutes = time / 60;
-            int seconds = time % 60;
+            gint time = static_cast<int> (mpc_streaminfo_get_length(&info));
+            gint minutes = time / 60;
+            gint seconds = time % 60;
 
             mpcGtkPrintLabel(streamLabel,    _("Streamversion %d"), info.stream_version);
             mpcGtkPrintLabel(encoderLabel,   _("Encoder: %s"), info.encoder);
@@ -611,30 +611,30 @@
             gtk_entry_set_text(GTK_ENTRY(albumEntry),   tags.album);
             gtk_entry_set_text(GTK_ENTRY(commentEntry), tags.comment);
             gtk_entry_set_text(GTK_ENTRY(genreEntry),   tags.genre);
-            char* entry = g_strdup_printf ("%d", tags.track);
+            gchar* entry = g_strdup_printf ("%d", tags.track);
             gtk_entry_set_text(GTK_ENTRY(trackEntry), entry);
-            free(entry);
+            g_free(entry);
             entry = g_strdup_printf ("%d", tags.year);
             gtk_entry_set_text(GTK_ENTRY(yearEntry), entry);
-            free(entry);
+            g_free(entry);
             entry = g_filename_display_name(p_Filename);
             gtk_entry_set_text(GTK_ENTRY(fileEntry), entry);
-            free(entry);
+            g_free(entry);
             freeTags(tags);
             aud_vfs_fclose(input);
         }
         else
         {
-            char* temp = g_strdup_printf("[xmms-musepack] mpcFileInfoBox is unable to read tags from %s", p_Filename);
+            gchar* temp = g_strdup_printf("[xmms-musepack] mpcFileInfoBox is unable to read tags from %s", p_Filename);
             perror(temp);
-            free(temp);
+            g_free(temp);
         }
 
-	char* name = g_filename_display_basename(p_Filename);
-        char* text = g_strdup_printf(_("File Info - %s"), name);
-        free(name);
+	gchar* name = g_filename_display_basename(p_Filename);
+        gchar* text = g_strdup_printf(_("File Info - %s"), name);
+        g_free(name);
         gtk_window_set_title(GTK_WINDOW(infoBox), text);
-        free(text);
+        g_free(text);
 
         gtk_widget_show_all(infoBox);
     }
@@ -645,11 +645,11 @@
     va_list args;
 
     va_start(args, format);
-    char* temp = g_strdup_vprintf(format, args);
+    gchar* temp = g_strdup_vprintf(format, args);
     va_end(args);
 
     gtk_label_set_text(GTK_LABEL(widget), temp);
-    free(temp);
+    g_free(temp);
 }
 
 static GtkWidget* mpcGtkTagLabel(const char* p_Text, int a, int b, int c, int d, GtkWidget* p_Box)
@@ -703,11 +703,11 @@
     File oFile(gtk_entry_get_text(GTK_ENTRY(widgets.fileEntry)));
     Tag* poTag = oFile.tag();
 
-    char* cAlbum   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.albumEntry)));
-    char* cArtist  = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.artistEntry)));
-    char* cTitle   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.titleEntry)));
-    char* cGenre   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.genreEntry)));
-    char* cComment = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.commentEntry)));
+    gchar* cAlbum   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.albumEntry)));
+    gchar* cArtist  = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.artistEntry)));
+    gchar* cTitle   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.titleEntry)));
+    gchar* cGenre   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.genreEntry)));
+    gchar* cComment = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.commentEntry)));
 
     const String album   = String(cAlbum,   TagLib::String::UTF8);
     const String artist  = String(cArtist,  TagLib::String::UTF8);
@@ -723,11 +723,11 @@
     poTag->setYear(atoi(gtk_entry_get_text(GTK_ENTRY(widgets.yearEntry))));
     poTag->setTrack(atoi(gtk_entry_get_text(GTK_ENTRY(widgets.trackEntry))));
 
-    free(cAlbum);
-    free(cArtist);
-    free(cTitle);
-    free(cGenre);
-    free(cComment);
+    g_free(cAlbum);
+    g_free(cArtist);
+    g_free(cTitle);
+    g_free(cGenre);
+    g_free(cComment);
 
     oFile.save();
     closeInfoBox(NULL, NULL);
@@ -739,25 +739,24 @@
     widgets.infoBox = NULL;
 }
 
-static char* mpcGenerateTitle(const MpcInfo& p_Tags, char* p_Filename)
+static char* mpcGenerateTitle(const MpcInfo& p_Tags, gchar* p_Filename)
 {
     Tuple* tuple = mpcGetSongTuple(p_Filename);
 
-    char* title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
+    gchar* title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
 
     aud_tuple_free((void *) tuple);
     return title;
 }
 
-static void* endThread(char* p_FileName, VFSFile * p_FileHandle, bool release)
+static void* endThread(gchar* p_FileName, VFSFile * p_FileHandle, bool release)
 {
-    free(p_FileName);
     if(release)
         lockRelease();
     if(mpcDecoder.isError)
     {
         perror(mpcDecoder.isError);
-        free(mpcDecoder.isError);
+        g_free(mpcDecoder.isError);
         mpcDecoder.isError = NULL;
     }
     setAlive(false);
@@ -765,7 +764,7 @@
         aud_vfs_fclose(p_FileHandle);
     if(track.display)
     {
-        free(track.display);
+        g_free(track.display);
         track.display = NULL;
     }
     return 0;
@@ -774,7 +773,7 @@
 static void* decodeStream(InputPlayback *data)
 {
     lockAcquire();
-    char* filename = data->filename;
+    gchar* filename = data->filename;
     VFSFile *input = aud_vfs_fopen(filename, "rb");
     if (!input)
     {
@@ -827,7 +826,7 @@
 
     lockRelease();
 
-    int counter = 2 * track.sampleFreq / 3;
+    gint counter = 2 * track.sampleFreq / 3;
     while (isAlive())
     {
         if (getOffset() != -1)
@@ -838,7 +837,7 @@
 
         lockAcquire();
         short iPlaying = MpcPlugin.output->buffer_playing()? 1 : 0;
-        int iFree = MpcPlugin.output->buffer_free();
+        gint iFree = MpcPlugin.output->buffer_free();
         if (!mpcDecoder.isPause &&  iFree >= ((1152 * 4) << iPlaying))
         {
             unsigned status = processBuffer(data, sampleBuffer, xmmsBuffer, decoder);
--- a/src/musepack/libmpc.h	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/musepack/libmpc.h	Thu Nov 01 15:38:07 2007 +0100
@@ -69,7 +69,7 @@
 
 typedef struct MpcDecoder
 {
-    char*      isError;
+    gchar*     isError;
     double     offset;
     bool       isOutput;
     bool       isAlive;
@@ -78,23 +78,23 @@
 
 typedef struct TrackInfo
 {
-    int   bitrate;
-    char* display;
-    int   length;
-    int   sampleFreq;
-    int   channels;
+    gint   bitrate;
+    gchar* display;
+    gint   length;
+    gint   sampleFreq;
+    gint   channels;
 };
 
 typedef struct MpcInfo
 {
-    char*    title;
-    char*    artist;
-    char*    album;
-    char*    comment;
-    char*    genre;
-    char*    date;
-    unsigned track;
-    unsigned year;
+    gchar*    title;
+    gchar*    artist;
+    gchar*    album;
+    gchar*    comment;
+    gchar*    genre;
+    gchar*    date;
+    unsigned  track;
+    unsigned  year;
 };
 
 static void       mpcOpenPlugin();
--- a/src/neon/neon.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/neon/neon.c	Thu Nov 01 15:38:07 2007 +0100
@@ -477,7 +477,14 @@
 
     _ENTER;
 
-    handle->request = ne_request_create(handle->session, "GET", handle->purl->path);
+    if (handle->purl->query && *(handle->purl->query)) {
+        gchar *tmp = g_strdup_printf("%s?%s", handle->purl->path, handle->purl->query);
+        handle->request = ne_request_create(handle->session, "GET", tmp);
+        g_free(tmp);
+    } else {
+        handle->request = ne_request_create(handle->session, "GET", handle->purl->path);
+    }
+
     ne_print_request_header(handle->request, "Range", "bytes=%ld-", startbyte);
     ne_print_request_header(handle->request, "Icy-MetaData", "1");
 
@@ -548,17 +555,17 @@
 
     _ENTER;
 
-    db = bmp_cfg_db_open();
-    if (FALSE == bmp_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) {
+    db = aud_cfg_db_open();
+    if (FALSE == aud_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) {
         use_proxy = FALSE;
     }
 
     if (use_proxy) {
-        if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) {
+        if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) {
             _ERROR("Could not read proxy host, disabling proxy use");
             use_proxy = FALSE;
         }
-        if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) {
+        if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) {
             _ERROR("Could not read proxy port, disabling proxy use");
             use_proxy = FALSE;
         }
@@ -571,7 +578,7 @@
             use_proxy = FALSE;
         }
     }
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     handle->redircount = 0;
 
--- a/src/null/null.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/null/null.c	Thu Nov 01 15:38:07 2007 +0100
@@ -45,9 +45,9 @@
 static void null_init(void)
 {
 	ConfigDb *db;
-	db = bmp_cfg_db_open();
-	bmp_cfg_db_get_bool(db, "null", "real_time", &real_time);
-	bmp_cfg_db_close(db);
+	db = aud_cfg_db_open();
+	aud_cfg_db_get_bool(db, "null", "real_time", &real_time);
+	aud_cfg_db_close(db);
 }
 
 static void null_about(void)
@@ -75,10 +75,10 @@
 {
 	ConfigDb *db;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 	real_time = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data));
-	bmp_cfg_db_set_bool(db, "null", "real_time", real_time);
-	bmp_cfg_db_close(db);
+	aud_cfg_db_set_bool(db, "null", "real_time", real_time);
+	aud_cfg_db_close(db);
 	gtk_widget_destroy(configurewin);
 }
 
--- a/src/paranormal-ng/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -30,4 +30,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../../intl -I../.. -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${SDL_LIBS} -lGL
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${SDL_LIBS} -lGL -lGLU
--- a/src/paranormal-ng/builtins.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/builtins.c	Thu Nov 01 15:38:07 2007 +0100
@@ -66,12 +66,7 @@
 DECLARE_ACTUATOR (wave_scope);
 
 /* **************** xform **************** */
-DECLARE_ACTUATOR (xform_spin);
-DECLARE_ACTUATOR (xform_ripple);
-DECLARE_ACTUATOR (xform_bump_spin);
-DECLARE_ACTUATOR (xform_halfrender);
-DECLARE_ACTUATOR (xform_movement);
-DECLARE_ACTUATOR (xform_dynmovement);
+DECLARE_ACTUATOR (xform_adjust);
 
 /* **************** builtin_table **************** */
 struct pn_actuator_desc *builtin_table[] =
@@ -112,12 +107,7 @@
   &builtin_wave_radial,
   &builtin_wave_scope,
   /* **************** xform **************** */
-  &builtin_xform_spin,
-  &builtin_xform_ripple,
-  &builtin_xform_bump_spin,
-  &builtin_xform_halfrender,
-  &builtin_xform_movement,
-  &builtin_xform_dynmovement,
+  &builtin_xform_adjust,
   /* **************** the end! **************** */
   NULL
 };
--- a/src/paranormal-ng/cfg.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/cfg.c	Thu Nov 01 15:38:07 2007 +0100
@@ -370,11 +370,11 @@
       GtkCTreeNode *root;
       ConfigDb *db;
 
-      db = bmp_cfg_db_open();
+      db = aud_cfg_db_open();
       fname = (char *) gtk_file_selection_get_filename (selector);
       a = load_preset (fname);
-      bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname);
-      bmp_cfg_db_close(db);
+      aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname);
+      aud_cfg_db_close(db);
       if (! a)
 	pn_error ("Unable to load file: \"%s\"", fname);
       else
@@ -395,12 +395,12 @@
   ConfigDb *db;
   gchar *last_path;
 
-  db = bmp_cfg_db_open();
+  db = aud_cfg_db_open();
   selector = gtk_file_selection_new ("Load Preset");
-  if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) {
+  if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) {
      gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path);
   }
-  bmp_cfg_db_close(db);
+  aud_cfg_db_close(db);
 
   gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
 		      "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector);
--- a/src/paranormal-ng/general.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/general.c	Thu Nov 01 15:38:07 2007 +0100
@@ -56,58 +56,63 @@
   NULL, NULL, general_fade_exec
 };
 
+/* thanks to feelgood_ICBM @ freenode for this */
+#define glError() { GLenum err; for(err = glGetError(); err; err = glGetError()) { fprintf(stderr, "glError: %s caught at %s:%u\n", \
+	(GLchar*)gluErrorString(err), __FILE__, __LINE__); } }
+
 /* **************** general_blur **************** */
-/* FIXME: add a variable radius */
-/* FIXME: SPEEEED */
 static void
 general_blur_exec (const struct pn_actuator_option *opts,
 	   gpointer data)
 {
-  int i,j;
-  register guchar *srcptr = pn_image_data->surface[0];
-  register guchar *destptr = pn_image_data->surface[1];
-  register int sum;
+  GLuint texture_id;
+
+  glGenTextures(1, &texture_id);
+  glBindTexture(GL_TEXTURE_2D, texture_id);
+
+  glError();
+
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 128, 128, 0, GL_RGBA, GL_BYTE, NULL);
+
+  glError();
 
-  for (j=0; j<pn_image_data->height; j++)
-    for (i=0; i<pn_image_data->width; i++)
-      {
-	sum = *(srcptr)<<2;
+  glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, -1, -1, 1, 1, 0);
+
+  glError();
+
+  glBindTexture(GL_TEXTURE_2D, 0);
+
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  glBindTexture(GL_TEXTURE_2D, texture_id);
 
-	/* top */
-	if (j > 0)
-	  {
-	    sum += *(srcptr-pn_image_data->width)<<1;
-	    if (i > 0)
-	      sum += *(srcptr-pn_image_data->width-1);
-	    if (i < pn_image_data->width-1)
-	      sum += *(srcptr-pn_image_data->width+1);
-	  }
-	/* bottom */
-	if (j < pn_image_data->height-1)
-	  {
-	    sum += *(srcptr+pn_image_data->width)<<1;
-	    if (i > 0)
-	      sum += *(srcptr+pn_image_data->width-1);
-	    if (i < pn_image_data->width-1)
-	      sum += *(srcptr+pn_image_data->width+1);
-	  }
-	/* left */
-	if (i > 0)
-	  sum += *(srcptr-1)<<1;
-	/* right */
-	if (i < pn_image_data->width-1)
-	  sum += *(srcptr+1)<<1;
+  glError();
+
+  glBegin(GL_QUADS);
+
+  glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+  glTexCoord2f(0, 1);
+  glVertex2i(-1, -1);
+  glVertex2i(-1, 1);
+  glVertex2i(1, 1);
+  glVertex2i(1, -1);
 
-	*destptr++ = (guchar)(sum >> 4);
-	srcptr++;
-      }
+  glEnd();
+  glBindTexture(GL_TEXTURE_2D, 0);
+
+  glError();
 
-  pn_swap_surfaces ();
+  glDeleteTextures(1, &texture_id);
+
+  glFlush();
+
+  glError();
 }
 
 struct pn_actuator_desc builtin_general_blur = 
 {
-  "general_blur", "Blur", "A simple 1 pixel radius blur",
+  "general_blur", "Blur", "A simple radial blur",
   0, NULL,
   NULL, NULL, general_blur_exec
 };
--- a/src/paranormal-ng/paranormal.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/paranormal.c	Thu Nov 01 15:38:07 2007 +0100
@@ -51,7 +51,6 @@
 static void
 blit_to_screen (void)
 {
-  SDL_GL_SwapBuffers();
 }
 
 static void
@@ -203,8 +202,15 @@
 
   if (pn_rc->actuator)
     {
+      // set the viewport to a texture size
+      glViewport(0, 0, 128, 128);
+
+      // run actuators
       exec_actuator (pn_rc->actuator);
-      blit_to_screen ();
+
+      // reset the viewport to window size and draw
+      glViewport(0, 0, pn_image_data->width, pn_image_data->height);
+      SDL_GL_SwapBuffers();
     }
 }
 
--- a/src/paranormal-ng/xform.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal-ng/xform.c	Thu Nov 01 15:38:07 2007 +0100
@@ -34,437 +34,31 @@
 
 #include "libcalc/calc.h"
 
-struct xform_vector
-{
-  gint32 offset; /* the offset of the top left pixel */
-  guint16 w; /* 4:4:4:4 NE, NW, SE, SW pixel weights
-		  The total should be 16 */
-
-  /* if offset < 0 then w is the color index to
-     which the pixel will be set */
-};
-
-static void
-xfvec (float x, float y, struct xform_vector *v)
-{
-  float xd, yd;
-  int weight[4];
-
-  if (x >= pn_image_data->width-1 || y >= pn_image_data->height-1
-      || x < 0 || y < 0)
-    {
-      v->offset = -1;
-      v->w = 0;
-      return;
-    }
-
-  v->offset = PN_IMG_INDEX (floor(x), floor(y));
-
-  xd = x - floor (x);
-  yd = y - floor (y);
-
-  weight[3] = xd * yd * 16;
-  weight[2] = (1-xd) * yd * 16;
-  weight[1] = xd * (1-yd) * 16;
-  weight[0] = 16 - weight[3] - weight[2] - weight[1]; /* just in case */
-
-  v->w = (weight[0]<<12) | (weight[1]<<8) | (weight[2]<<4) | weight[3];
-}
-
-static void
-apply_xform (struct xform_vector *vfield)
-{
-  int i;
-  struct xform_vector *v;
-  register guchar *srcptr;
-  register guchar *destptr;
-  register int color;
-
-  if (vfield == NULL)
-      return;
-
-  for (i=0, v=vfield, destptr=pn_image_data->surface[1];
-       i<pn_image_data->width*pn_image_data->height;
-       i++, v++, destptr++)
-    {
-      /* off the screen */
-      if (v->offset < 0)
-	{
-	  *destptr = (guchar)v->w;
-	  continue;
-	}
-
-      srcptr = pn_image_data->surface[0] + v->offset;
-
-      /* exactly on the pixel */
-      if (v->w == 0)
-	  *destptr = *srcptr;
-      
-      /* gotta blend the points */
-      else
-	{
-	  color =  *srcptr * (v->w>>12);
-	  color += *++srcptr * ((v->w>>8) & 0x0f);
-	  color += *(srcptr+=pn_image_data->width) * (v->w & 0x0f);
-	  color += *(--srcptr) * ((v->w>>4) & 0x0f);
-	  color >>= 4;
-	  *destptr = (guchar)color;
-	}
-    }
-}
-
-/* **************** xform_spin **************** */
-/* FIXME: Describe these better, how they are backwards */
-/* FIXME: better name? */
-struct pn_actuator_option_desc xform_spin_opts[] =
-{
-  { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: -8.0 } },
-  { "r_add", "The number of pixels by which the r coordinate will be "
-    "increased (before scaling)", OPT_TYPE_FLOAT, { fval: 0.0 } },
-  { "r_scale", "The amount by which the r coordinate of each pixel will "
-    "be scaled", OPT_TYPE_FLOAT, { fval: 1.0 } },
-  { NULL }
-};
-
-struct xform_spin_data
-{
-  int width, height;
-  struct xform_vector *vfield;
-};
-
-static void
-xform_spin_init (gpointer *data)
-{
-  *data = g_new0 (struct xform_spin_data, 1);
-}
-
-static void
-xform_spin_cleanup (gpointer data)
-{
-  struct xform_spin_data *d = (struct xform_spin_data *) data;
-
-  
-  if (d)
-    {
-      if (d->vfield)
-	g_free (d->vfield);
-      g_free (d);
-    }
-}
-
-static void
-xform_spin_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
-  struct xform_spin_data *d = (struct xform_spin_data*)data;
-  float i, j;
-
-  if (d->width != pn_image_data->width
-      || d->height != pn_image_data->height)
-    {
-      d->width = pn_image_data->width;
-      d->height = pn_image_data->height;
-
-      if (d->vfield)
-	g_free (d->vfield);
-
-      d->vfield = g_malloc0 (sizeof(struct xform_vector)
-			    * d->width * d->height);
-
-      for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	  {
-	    float r, t = 0;
-	    float x, y;
-
-	    r = sqrt (i*i + j*j);
-	    if (r)
-	      t = asin (j/r);
-	    if (i < 0)
-	      t = M_PI - t;
-
-	    t += opts[0].val.fval * M_PI/180.0; 
-	    r += opts[1].val.fval;
-	    r *= opts[2].val.fval;
-
-	    x = (r * cos (t)) + (pn_image_data->width>>1);
-	    y = (pn_image_data->height>>1) - (r * sin (t));
-
-	    xfvec (x, y, &d->vfield
-		   [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				  ((pn_image_data->height>>1)-(int)rint(j)))]);
-	  }
-    }
-
-  apply_xform (d->vfield);
-  pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_spin =
-{
-  "xform_spin", "Spin Transform", 
-  "Rotates and radially scales the image",
-  0, xform_spin_opts,
-  xform_spin_init, xform_spin_cleanup, xform_spin_exec
-};
-
-/* **************** xform_ripple **************** */
-struct pn_actuator_option_desc xform_ripple_opts[] =
-{
-  { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
-  { "ripples", "The number of ripples that fit on the screen "
-    "(horizontally)", OPT_TYPE_FLOAT, { fval: 8 } },
-  { "base_speed", "The minimum number of pixels to move each pixel",
-    OPT_TYPE_FLOAT, { fval: 1 } },
-  { "mod_speed", "The maximum number of pixels by which base_speed"
-    " will be modified", OPT_TYPE_FLOAT, { fval: 1 } },
-  { NULL }
-};
-
-struct xform_ripple_data
+/* **************** xform_adjust **************** */
+struct pn_actuator_option_desc xform_adjust_opts[] =
 {
-  int width, height;
-  struct xform_vector *vfield;
-};
-
-static void
-xform_ripple_init (gpointer *data)
-{
-  *data = g_new0 (struct xform_ripple_data, 1);
-}
-
-static void
-xform_ripple_cleanup (gpointer data)
-{
-  struct xform_ripple_data *d = (struct xform_ripple_data*) data;
-
-  if (d)
-    {
-      if (d->vfield)
-	g_free (d->vfield);
-      g_free (d);
-    }
-}
-
-static void
-xform_ripple_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
-  struct xform_ripple_data *d = (struct xform_ripple_data*)data;
-  float i, j;
-
-  if (d->width != pn_image_data->width
-      || d->height != pn_image_data->height)
-    {
-      d->width = pn_image_data->width;
-      d->height = pn_image_data->height;
-
-      if (d->vfield)
-	g_free (d->vfield);
-
-      d->vfield = g_malloc (sizeof(struct xform_vector)
-			    * d->width * d->height);
-
-      for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	  {
-	    float r, t = 0;
-	    float x, y;
-
-	    r = sqrt (i*i + j*j);
-	    if (r)
-	      t = asin (j/r);
-	    if (i < 0)
-	      t = M_PI - t;
-
-	    t += opts[0].val.fval * M_PI/180.0; 
-
-	    if (r > 4)//(pn_image_data->width/(2*opts[1].val.fval)))
-	      r -=  opts[2].val.fval + (opts[3].val.fval/2) *
-		(1 + sin ((r/(pn_image_data->width/(2*opts[1].val.fval)))*M_PI));
-/*  	    else if (r > 4) */
-/*  	      r *= r/(pn_image_data->width/opts[1].val.fval); */
-	    else /* don't let it explode */
-	      r = 1000000;
-
-
-	    x = (r * cos (t)) + (pn_image_data->width>>1);
-	    y = (pn_image_data->height>>1) - (r * sin (t));
-
-	    xfvec (x, y, &d->vfield
-		   [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				  ((pn_image_data->height>>1)-(int)rint(j)))]);
-	  }
-    }
-
-  apply_xform (d->vfield);
-  pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_ripple =
-{
-  "xform_ripple", "Ripple Transform", "Creates an ripple effect",
-  0, xform_ripple_opts,
-  xform_ripple_init, xform_ripple_cleanup, xform_ripple_exec
-};
-
-/* **************** xform_bump_spin **************** */
-struct pn_actuator_option_desc xform_bump_spin_opts[] =
-{
-  { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
-  { "bumps", "The number of bumps that on the image",
-    OPT_TYPE_FLOAT, { fval: 8 } },
-  { "base_scale", "The base radial scale",
-    OPT_TYPE_FLOAT, { fval: 0.95 } },
-  { "mod_scale", "The maximum amount that should be "
-    "added to the base_scale to create the 'bump' effect",
-    OPT_TYPE_FLOAT, { fval: .1 } },
-  { NULL }
-};
-
-struct xform_bump_spin_data
-{
-  int width, height;
-  struct xform_vector *vfield;
-};
-
-static void
-xform_bump_spin_init (gpointer *data)
-{
-  *data = g_new0 (struct xform_bump_spin_data, 1);
-}
-
-static void
-xform_bump_spin_cleanup (gpointer data)
-{
-  struct xform_bump_spin_data *d = (struct xform_bump_spin_data*) data;
-
-  if (d)
-    {
-      if (d->vfield)
-	g_free (d->vfield);
-      g_free (d);
-    }
-}
-
-static void
-xform_bump_spin_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
-  struct xform_bump_spin_data *d = (struct xform_bump_spin_data*)data;
-  float i, j;
-
-  if (d->width != pn_image_data->width
-      || d->height != pn_image_data->height)
-    {
-      d->width = pn_image_data->width;
-      d->height = pn_image_data->height;
-
-      if (d->vfield)
-	g_free (d->vfield);
-
-      d->vfield = g_malloc (sizeof(struct xform_vector)
-			    * d->width * d->height);
-
-      for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	  {
-	    float r, t = 0;
-	    float x, y;
-
-	    r = sqrt (i*i + j*j);
-	    if (r)
-	      t = asin (j/r);
-	    if (i < 0)
-	      t = M_PI - t;
-
-	    t += opts[0].val.fval * M_PI/180.0;
-
-	    r *=  opts[2].val.fval + opts[3].val.fval
-	      * (1 + sin (t*opts[1].val.fval));
-
-	    x = (r * cos (t)) + (pn_image_data->width>>1);
-	    y = (pn_image_data->height>>1) - (r * sin (t));
-
-	    xfvec (x, y, &d->vfield
-		   [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				  ((pn_image_data->height>>1)-(int)rint(j)))]);
-	  }
-    }
-
-  apply_xform (d->vfield);
-  pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_bump_spin =
-{
-  "xform_bump_spin", "Bump Transform", 
-  "Rotate the image at a varying speed to create "
-  "the illusion of bumps",
-  0, xform_bump_spin_opts,
-  xform_bump_spin_init, xform_bump_spin_cleanup, xform_bump_spin_exec
-};
-
-/* **************** xform_halfrender **************** */
-struct pn_actuator_option_desc xform_halfrender_opts[] =
-{
-  { "direction", "Negative is horizontal, positive is vertical.", 
-    OPT_TYPE_INT, { ival: 1 } },
-  { "render_twice", "Render the second image.",
-    OPT_TYPE_BOOLEAN, { bval: TRUE } },
+  { "x", "adjustment to x", OPT_TYPE_FLOAT, { fval: 1.0 } },
+  { "y", "adjustment to y", OPT_TYPE_FLOAT, { fval: 1.0 } },
+  { "z", "adjustment to z", OPT_TYPE_FLOAT, { fval: 1.0 } },
   { NULL }
 };
 
 static void
-xform_halfrender_exec (const struct pn_actuator_option *opts,
+xform_adjust_exec (const struct pn_actuator_option *opts,
 		 gpointer data)
 {
-  gint x, y;
-
-  if (opts[0].val.ival < 0)
-    {
-       for (y = 0; y < pn_image_data->height; y += 2)
-         {
-            for (x = 0; x < pn_image_data->width; x++)
-              {
-                 pn_image_data->surface[1][PN_IMG_INDEX(x, y / 2)] =
-                   pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
-	         if (opts[1].val.bval)
-                   {
-                     pn_image_data->surface[1][PN_IMG_INDEX(x, (y / 2) + (pn_image_data->height / 2))] =
-                       pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
-                   }
-              }
-         }
-    }
-  else
-    {
-       for (y = 0; y < pn_image_data->height; y++)
-         {
-            for (x = 0; x < pn_image_data->width; x += 2)
-              {
-                 pn_image_data->surface[1][PN_IMG_INDEX(x / 2, y)] =
-                   pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
-                 if (opts[1].val.bval)
-                   {
-                     pn_image_data->surface[1][PN_IMG_INDEX((x / 2) + (pn_image_data->width / 2), y)] =
-                       pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
-                   }
-              }
-         }
-    }
-
-    pn_swap_surfaces ();
+  glTranslatef(opts[0].val.fval, opts[1].val.fval, opts[2].val.fval);
 }
 
-struct pn_actuator_desc builtin_xform_halfrender =
+struct pn_actuator_desc builtin_xform_adjust =
 {
-  "xform_halfrender", "Halfrender Transform",
-  "Divides the surface in half and renders it twice.",
-  0, xform_halfrender_opts,
-  NULL, NULL, xform_halfrender_exec
+  "xform_adjust", "Adjust", 
+  "Rotates and radially scales the image",
+  0, xform_adjust_opts,
+  NULL, NULL, xform_adjust_exec
 };
 
+#if 0
 /* **************** xform_movement **************** */
 struct pn_actuator_option_desc xform_movement_opts[] =
 {
@@ -779,3 +373,4 @@
   0, xform_dynmovement_opts,
   xform_dynmovement_init, xform_dynmovement_cleanup, xform_dynmovement_exec
 };
+#endif
--- a/src/paranormal/cfg.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal/cfg.c	Thu Nov 01 15:38:07 2007 +0100
@@ -370,11 +370,11 @@
       GtkCTreeNode *root;
       ConfigDb *db;
 
-      db = bmp_cfg_db_open();
+      db = aud_cfg_db_open();
       fname = (char *) gtk_file_selection_get_filename (selector);
       a = load_preset (fname);
-      bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname);
-      bmp_cfg_db_close(db);
+      aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname);
+      aud_cfg_db_close(db);
       if (! a)
 	pn_error ("Unable to load file: \"%s\"", fname);
       else
@@ -395,12 +395,12 @@
   ConfigDb *db;
   gchar *last_path;
 
-  db = bmp_cfg_db_open();
+  db = aud_cfg_db_open();
   selector = gtk_file_selection_new ("Load Preset");
-  if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) {
+  if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) {
      gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path);
   }
-  bmp_cfg_db_close(db);
+  aud_cfg_db_close(db);
 
   gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
 		      "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector);
--- a/src/paranormal/plugin.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/paranormal/plugin.c	Thu Nov 01 15:38:07 2007 +0100
@@ -39,8 +39,8 @@
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 
 #include "paranormal.h"
 #include "actuators.h"
--- a/src/rootvis/config_backend.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/rootvis/config_backend.c	Thu Nov 01 15:38:07 2007 +0100
@@ -43,18 +43,18 @@
 	{
 		case BOOLN:
 		case INT:
-			bmp_cfg_db_set_int(fp, sect, val.name, *val.vali.var);
+			aud_cfg_db_set_int(fp, sect, val.name, *val.vali.var);
 		break;
 		case FLOAT:
-			bmp_cfg_db_set_float(fp, sect, val.name, *val.valf.var);
+			aud_cfg_db_set_float(fp, sect, val.name, *val.valf.var);
 		break;
 		case TEXT:
-			bmp_cfg_db_set_string(fp, sect, val.name, *val.valt.var);
+			aud_cfg_db_set_string(fp, sect, val.name, *val.valt.var);
 		break;
 		case COLOR:
 		{
 			char colortmp[10];
-			bmp_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp));
+			aud_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp));
 		}
 		break;
 	}
@@ -66,21 +66,21 @@
 	{
 		case BOOLN:
 		case INT:
-			if (!(bmp_cfg_db_get_int(fp, sect, val.name, val.vali.var)))
+			if (!(aud_cfg_db_get_int(fp, sect, val.name, val.vali.var)))
 				cval_writefile(val, fp, sect);
 		break;
 		case FLOAT:
-			if (!(bmp_cfg_db_get_float(fp, sect, val.name, val.valf.var)))
+			if (!(aud_cfg_db_get_float(fp, sect, val.name, val.valf.var)))
 				cval_writefile(val, fp, sect);
 		break;
 		case TEXT:
-			if (!(bmp_cfg_db_get_string(fp, sect, val.name, val.valt.var)))
+			if (!(aud_cfg_db_get_string(fp, sect, val.name, val.valt.var)))
 				cval_writefile(val, fp, sect);
 		break;
 		case COLOR:
 		{
 			char* colortmp = NULL;
-			if (!(bmp_cfg_db_get_string(fp, sect, val.name, &colortmp)))
+			if (!(aud_cfg_db_get_string(fp, sect, val.name, &colortmp)))
 				cval_writefile(val, fp, sect);
 			else	color_quad2arr(val.valc.var, colortmp);
 		}
@@ -95,7 +95,7 @@
 	int i, j;
 	ConfigDb *fp;
 
-	fp = bmp_cfg_db_open();
+	fp = aud_cfg_db_open();
 
 	print_status("Reading configuration");
 
@@ -114,7 +114,7 @@
 				cval_readfile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2"));
 			}
 
-	bmp_cfg_db_close(fp);
+	aud_cfg_db_close(fp);
 	print_status("Configuration finished");
 }
 
@@ -123,7 +123,7 @@
 	ConfigDb *fp;
 
 	print_status("Writing configuration");
-	fp = bmp_cfg_db_open();
+	fp = aud_cfg_db_open();
 
 	if (number == 2)
 		for (i = 0; i < Cmain.count; ++i)
@@ -134,7 +134,7 @@
 			for (i = 0; i < Cchannel[j].count; ++i)
 				cval_writefile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2"));
 
-	bmp_cfg_db_close(fp);
+	aud_cfg_db_close(fp);
 }
 
 void config_revert(int number) {
--- a/src/scrobbler/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/scrobbler/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -20,4 +20,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS} ${MOWGLI_LIBS}
--- a/src/scrobbler/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/scrobbler/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -50,20 +50,20 @@
         const char *ge_uid = gtk_entry_get_text(GTK_ENTRY(ge_entry1));
         const char *ge_pwd = gtk_entry_get_text(GTK_ENTRY(ge_entry2));
 
-        if ((cfgfile = bmp_cfg_db_open()))
+        if ((cfgfile = aud_cfg_db_open()))
 	{
                 md5_state_t md5state;
                 unsigned char md5pword[16], ge_md5pword[16];
 
-                bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid);
-                bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid);
+                aud_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid);
+                aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid);
 
                 if (pwd != NULL && pwd[0] != '\0' && strlen(pwd))
 		{
                         md5_init(&md5state);
                         md5_append(&md5state, (unsigned const char *)pwd, strlen(pwd));
                         md5_finish(&md5state, md5pword);
-                        bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "password",
+                        aud_cfg_db_set_string(cfgfile, "audioscrobbler", "password",
                                         hexify((char*)md5pword, sizeof(md5pword)));
                 }
 
@@ -72,11 +72,11 @@
                         md5_init(&md5state);
                         md5_append(&md5state, (unsigned const char *)ge_pwd, strlen(ge_pwd));
                         md5_finish(&md5state, ge_md5pword);
-                        bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password",
+                        aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password",
                                         hexify((char*)ge_md5pword, sizeof(ge_md5pword)));
                 }
 
-                bmp_cfg_db_close(cfgfile);
+                aud_cfg_db_close(cfgfile);
         }
 }
 
@@ -197,10 +197,10 @@
 	gtk_entry_set_text(GTK_ENTRY(entry1), "");
 	gtk_entry_set_text(GTK_ENTRY(entry2), "");
 
-        if ((db = bmp_cfg_db_open())) {
+        if ((db = aud_cfg_db_open())) {
                 gchar *username = NULL;
 		// last fm
-                bmp_cfg_db_get_string(db, "audioscrobbler", "username",
+                aud_cfg_db_get_string(db, "audioscrobbler", "username",
                         &username);
                 if (username) {
                         gtk_entry_set_text(GTK_ENTRY(entry1), username);
@@ -208,7 +208,7 @@
 			username = NULL;
                 }
 		// gerpok
-                bmp_cfg_db_get_string(db, "audioscrobbler", "ge_username",
+                aud_cfg_db_get_string(db, "audioscrobbler", "ge_username",
                         &username);
                 if (username) {
                         gtk_entry_set_text(GTK_ENTRY(ge_entry1), username);
@@ -216,7 +216,7 @@
 			username = NULL;
                 }
 
-                bmp_cfg_db_close(db);
+                aud_cfg_db_close(db);
         }
 
   return vbox2;
--- a/src/scrobbler/plugin.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/scrobbler/plugin.c	Thu Nov 01 15:38:07 2007 +0100
@@ -103,16 +103,16 @@
 
         aud_prefswin_page_new(cfgdlg, "Scrobbler", DATA_DIR "/images/audioscrobbler.png");
 
-	if ((cfgfile = bmp_cfg_db_open()) != NULL) {
-		bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "username",
+	if ((cfgfile = aud_cfg_db_open()) != NULL) {
+		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "username",
 				&username);
-		bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "password",
+		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "password",
 				&password);
-		bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username",
+		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username",
 				&ge_username);
-		bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password",
+		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password",
 				&ge_password);
-		bmp_cfg_db_close(cfgfile);
+		aud_cfg_db_close(cfgfile);
 	}
 
 	if ((!username || !password) || (!*username || !*password))
--- a/src/sexypsf/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sexypsf/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -20,4 +20,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -Ispu/ -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lz
--- a/src/sexypsf/plugin.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sexypsf/plugin.c	Thu Nov 01 15:38:07 2007 +0100
@@ -113,7 +113,9 @@
         }
 
         // timeout at the end of a file
-        sleep(4);
+        while (playback->output->buffer_playing())
+             g_usleep(10000);
+
         break;
     }
 
@@ -222,10 +224,10 @@
 
     if (tmp->length) {
         tuple = aud_tuple_new_from_filename(fn);
-	aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, tmp->length);
-	aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, tmp->artist);
-	aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, tmp->game);
-	aud_tuple_associate_string(tuple, -1, "game", tmp->game);
+        aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, tmp->length);
+        aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, tmp->artist);
+        aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, tmp->game);
+        aud_tuple_associate_string(tuple, -1, "game", tmp->game);
         aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, tmp->title);
         aud_tuple_associate_string(tuple, FIELD_GENRE, NULL, tmp->genre);
         aud_tuple_associate_string(tuple, FIELD_COPYRIGHT, NULL, tmp->copyright);
--- a/src/shnplug/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/shnplug/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -25,5 +25,3 @@
 	    ${PANGO_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../../intl -I../.. -Wall
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
 
-# These were the additional link flags in the old Makefile:
-# -L/opt/local/lib -L${plugindir} -laudid3tag -Wl,-rpath=${plugindir}
--- a/src/shnplug/gtk.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/shnplug/gtk.c	Thu Nov 01 15:38:07 2007 +0100
@@ -125,16 +125,16 @@
 	shn_cfg.textfile_extensions = g_strdup(gtk_entry_get_text(GTK_ENTRY(textfile_extensions_entry)));
 
 	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
-	cfg = bmp_cfg_db_open();
-	bmp_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method);
-	bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose);
-	bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path);
-	bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path);
-	bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes);
-	bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles);
-	bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions);
+	cfg = aud_cfg_db_open();
+	aud_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method);
+	aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose);
+	aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path);
+	aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path);
+	aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes);
+	aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles);
+	aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions);
 
-	bmp_cfg_db_close(cfg);
+	aud_cfg_db_close(cfg);
 	g_free(filename);
 }
 
--- a/src/shnplug/shn.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/shnplug/shn.c	Thu Nov 01 15:38:07 2007 +0100
@@ -107,19 +107,19 @@
 	shn_cfg.textfile_extensions = NULL;
 	shn_cfg.textfile_extensions_config_name = "textfile_extensions";
 
-	if ((cfg = bmp_cfg_db_open()) != 0)
+	if ((cfg = aud_cfg_db_open()) != 0)
 	{
-		bmp_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method);
-		bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose);
-		if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path))
+		aud_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method);
+		aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose);
+		if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path))
 			shn_cfg.seek_tables_path = g_strdup(g_get_home_dir());
-		if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path))
+		if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path))
 			shn_cfg.relative_seek_tables_path = g_strdup("");
-		bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes);
-		bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles);
-		if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions))
+		aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes);
+		aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles);
+		if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions))
 			shn_cfg.textfile_extensions = g_strdup("txt,nfo");
-		bmp_cfg_db_close(cfg);
+		aud_cfg_db_close(cfg);
 	}
 }
 
--- a/src/sid/xmms-sid.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sid/xmms-sid.c	Thu Nov 01 15:38:07 2007 +0100
@@ -87,7 +87,7 @@
 XS_MUTEX(xs_status);
 static XS_THREAD_T xs_decode_thread;
 
-void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune);
+static void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune);
 
 /*
  * Error messages
@@ -591,7 +591,7 @@
 /*
  * Return song information Tuple
  */
-void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune)
+static void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune)
 {
 	gchar *tmpStr, tmpStr2[64];
 
@@ -599,11 +599,6 @@
 	aud_tuple_associate_string(pResult, FIELD_ARTIST, NULL, pInfo->sidComposer);
 	aud_tuple_associate_string(pResult, FIELD_GENRE, NULL, "SID-tune");
 	aud_tuple_associate_string(pResult, FIELD_COPYRIGHT, NULL, pInfo->sidCopyright);
-
-	if (xs_cfg.subAutoEnable)
-		aud_tuple_associate_int(pResult, FIELD_SUBSONG_NUM, NULL, pInfo->nsubTunes);
-
-	aud_tuple_associate_int(pResult, -1, "subtunes", pInfo->nsubTunes);
 	aud_tuple_associate_string(pResult, -1, "sid-format", pInfo->sidFormat);
 
 	switch (pInfo->sidModel) {
@@ -641,8 +636,8 @@
 		aud_tuple_associate_string(pResult, -1, "sid-speed", tmpStr);
 	} else
 		subTune = 1;
-
-	aud_tuple_associate_int(pResult, -1, "subtune", subTune);
+	
+	aud_tuple_associate_int(pResult, FIELD_SUBSONG_NUM, NULL, pInfo->nsubTunes);
 	aud_tuple_associate_int(pResult, FIELD_SUBSONG_ID, NULL, subTune);
 	aud_tuple_associate_int(pResult, FIELD_TRACK_NUMBER, NULL, subTune);
 
@@ -705,7 +700,6 @@
 
 	/* Get information from URL */
 	xs_get_trackinfo(songFilename, &tmpFilename, &tmpTune);
-
 	tmpResult = aud_tuple_new_from_filename(tmpFilename);
 	if (!tmpResult) {
 		g_free(tmpFilename);
@@ -722,6 +716,27 @@
 		return tmpResult;
 	
 	xs_get_song_tuple_info(tmpResult, tmpInfo, tmpTune);
+
+	/* Set subtunes */
+	if (xs_cfg.subAutoEnable && tmpInfo->nsubTunes > 1 && tmpTune < 0) {
+		gint i, n;
+		tmpResult->subtunes = g_new(gint, tmpInfo->nsubTunes);
+		for (n = 0, i = 1; i <= tmpInfo->nsubTunes; i++) {
+			gboolean doAdd = FALSE;
+					
+			if (xs_cfg.subAutoMinOnly) {
+				if (i == tmpInfo->startTune ||
+					tmpInfo->subTunes[i - 1].tuneLength >= xs_cfg.subAutoMinTime)
+					doAdd = TRUE;
+			} else
+				doAdd = TRUE;
+					
+			if (doAdd) tmpResult->subtunes[n++] = i;
+		}
+		tmpResult->nsubtunes = n;
+	} else
+		tmpResult->nsubtunes = 0;
+	
 	xs_tuneinfo_free(tmpInfo);
 
 	return tmpResult;
--- a/src/sid/xs_about.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sid/xs_about.c	Thu Nov 01 15:38:07 2007 +0100
@@ -155,6 +155,8 @@
 			"\n"
 			"This release of XMMS-SID is dedicated to\n"
 			"            Richard Joseph\n"
+			"                  and\n"
+			"      Lauri Sipilä (aka Xaztur/PWP)\n"
 			" - Now gone, but forever in our hearts -\n"
 			"\n"
 			"\n"
@@ -162,7 +164,8 @@
 			"\tTecnic Software productions (TNSP)\n"
 			"\n"
 			"Programming and design\n"
-			"\tMatti 'ccr' Hämäläinen\n" "\n"
+			"\tMatti 'ccr' Hämäläinen\n"
+			"\n"
 #ifdef HAVE_SIDPLAY1
 			"libSIDPlay1 created by\n"
 			"\tMichael Schwendt\n" "\n"
@@ -170,7 +173,8 @@
 #ifdef HAVE_SIDPLAY2
 			"libSIDPlay2 and reSID created by\n"
 			"\tSimon White, Dag Lem,\n"
-			"\tMichael Schwendt and rest.\n" "\n"
+			"\tMichael Schwendt and rest.\n"
+			"\n"
 #endif
 #ifdef HAVE_THEMETUNE
 			"\"Kummatti City\", theme of XMMS-SID 0.8\n"
--- a/src/sid/xs_config.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sid/xs_config.c	Thu Nov 01 15:38:07 2007 +0100
@@ -285,7 +285,7 @@
 #endif
 
 #ifdef AUDACIOUS_PLUGIN
-	xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subtune}/${subtunes}> [${sid-model}/${sid-speed}]");
+	xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subsong-id}/${subsong-num}> [${sid-model}/${sid-speed}]");
 #else
 	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) <%n/%N> [%m/%C]");
 #endif
--- a/src/sndstretch/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sndstretch/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -10,3 +10,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MONWGLI_LIBS} ${PANGO_LIBS}
--- a/src/sndstretch/sndstretch_xmms.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sndstretch/sndstretch_xmms.c	Thu Nov 01 15:38:07 2007 +0100
@@ -257,15 +257,15 @@
 
 static gint sndstretch_config_destroy_cb(GtkWidget * w, GdkEventAny * e, gpointer data)
 {
-	ConfigDb *db = bmp_cfg_db_open();
+	ConfigDb *db = aud_cfg_db_open();
 
-	bmp_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch);
-	bmp_cfg_db_set_double(db, "sndstretch", "speed", SS.speed);
+	aud_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch);
+	aud_cfg_db_set_double(db, "sndstretch", "speed", SS.speed);
 
-	bmp_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap);
-	bmp_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr);
+	aud_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap);
+	aud_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr);
 
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 
 	gtk_widget_destroy(sndstretch_config_dialog);
 	sndstretch_config_dialog = NULL;
@@ -405,7 +405,7 @@
 {
 	ConfigDb *db;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
 	SS.fragsize=0;
 	SS.chnr=2;
@@ -423,13 +423,13 @@
 	SS.scale=1.0;
 
 	gboolean b;
-	bmp_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch);
-	bmp_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed);
-	if (bmp_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b))
+	aud_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch);
+	aud_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed);
+	if (aud_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b))
 		SS.short_overlap = b;
-	if (bmp_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b))
+	if (aud_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b))
 		SS.volume_corr = b;
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 int sndstretch_mod_samples (gpointer *ptr, gint length, AFormat fmt, gint srate, gint nch)
--- a/src/song_change/song_change.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/song_change/song_change.c	Thu Nov 01 15:38:07 2007 +0100
@@ -169,16 +169,16 @@
 {
 	ConfigDb *db;
 
-	db = bmp_cfg_db_open();
-	if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) )
+	db = aud_cfg_db_open();
+	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) )
 		cmd_line = g_strdup("");
-	if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) )
+	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) )
 		cmd_line_after = g_strdup("");
-	if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) )
+	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) )
 		cmd_line_end = g_strdup("");
-	if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) )
+	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) )
 		cmd_line_ttc = g_strdup("");
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 static void cleanup(void)
@@ -219,12 +219,12 @@
 	cmd_end = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_end_entry)));
 	cmd_ttc = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_ttc_entry)));
 
-	db = bmp_cfg_db_open();
-	bmp_cfg_db_set_string(db, "song_change", "cmd_line", cmd);
-	bmp_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after);
-	bmp_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end);
-	bmp_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc);
-	bmp_cfg_db_close(db);
+	db = aud_cfg_db_open();
+	aud_cfg_db_set_string(db, "song_change", "cmd_line", cmd);
+	aud_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after);
+	aud_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end);
+	aud_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc);
+	aud_cfg_db_close(db);
 
 	if (cmd_line != NULL)
 		g_free(cmd_line);
--- a/src/statusicon/si_cfg.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/statusicon/si_cfg.c	Thu Nov 01 15:38:07 2007 +0100
@@ -29,27 +29,27 @@
 void
 si_cfg_load ( void )
 {
-  ConfigDb *cfgfile = bmp_cfg_db_open();
+  ConfigDb *cfgfile = aud_cfg_db_open();
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "statusicon" ,
        "rclick_menu" , &(si_cfg.rclick_menu) ) )
     si_cfg.rclick_menu = SI_CFG_RCLICK_MENU_AUD;
 
-  if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" ,
+  if ( !aud_cfg_db_get_int( cfgfile , "statusicon" ,
        "scroll_action" , &(si_cfg.scroll_action) ) )
     si_cfg.scroll_action = SI_CFG_SCROLL_ACTION_VOLUME;
     
-  if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" ,
+  if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" ,
        "mw_visib_prevstatus" , &(si_cfg.mw_visib_prevstatus) ) )
     si_cfg.mw_visib_prevstatus = FALSE;
-  if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" ,
+  if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" ,
        "pw_visib_prevstatus" , &(si_cfg.pw_visib_prevstatus) ) )
     si_cfg.pw_visib_prevstatus = FALSE;
-  if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" ,
+  if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" ,
        "ew_visib_prevstatus" , &(si_cfg.ew_visib_prevstatus) ) )
     si_cfg.ew_visib_prevstatus = FALSE;
 
-  bmp_cfg_db_close( cfgfile );
+  aud_cfg_db_close( cfgfile );
   return;
 }
 
@@ -57,21 +57,21 @@
 void
 si_cfg_save ( void )
 {
-  ConfigDb *cfgfile = bmp_cfg_db_open();
+  ConfigDb *cfgfile = aud_cfg_db_open();
 
-  bmp_cfg_db_set_int( cfgfile , "statusicon" ,
+  aud_cfg_db_set_int( cfgfile , "statusicon" ,
     "rclick_menu" , si_cfg.rclick_menu );
   
-  bmp_cfg_db_set_int( cfgfile , "statusicon" ,
+  aud_cfg_db_set_int( cfgfile , "statusicon" ,
     "scroll_action" , si_cfg.scroll_action );
   
-  bmp_cfg_db_set_bool( cfgfile , "statusicon" ,
+  aud_cfg_db_set_bool( cfgfile , "statusicon" ,
     "mw_visib_prevstatus" , si_cfg.mw_visib_prevstatus );
-  bmp_cfg_db_set_bool( cfgfile , "statusicon" ,
+  aud_cfg_db_set_bool( cfgfile , "statusicon" ,
     "pw_visib_prevstatus" , si_cfg.pw_visib_prevstatus );
-  bmp_cfg_db_set_bool( cfgfile , "statusicon" ,
+  aud_cfg_db_set_bool( cfgfile , "statusicon" ,
     "ew_visib_prevstatus" , si_cfg.ew_visib_prevstatus );
 
-  bmp_cfg_db_close( cfgfile );
+  aud_cfg_db_close( cfgfile );
   return;
 }
--- a/src/stereo_plugin/stereo.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/stereo_plugin/stereo.c	Thu Nov 01 15:38:07 2007 +0100
@@ -36,10 +36,10 @@
 static void init(void)
 {
 	ConfigDb *db;
-	db = bmp_cfg_db_open();
-	if (!bmp_cfg_db_get_double(db, "extra_stereo", "intensity", &value))
+	db = aud_cfg_db_open();
+	if (!aud_cfg_db_get_double(db, "extra_stereo", "intensity", &value))
 		value = 2.5;
-	bmp_cfg_db_close(db);
+	aud_cfg_db_close(db);
 }
 
 static void about(void)
@@ -63,9 +63,9 @@
 
 	value = *(gdouble *) data;
 	
-	db = bmp_cfg_db_open();
-	bmp_cfg_db_set_double(db, "extra_stereo", "intensity", value);
-	bmp_cfg_db_close(db);
+	db = aud_cfg_db_open();
+	aud_cfg_db_set_double(db, "extra_stereo", "intensity", value);
+	aud_cfg_db_close(db);
 	gtk_widget_destroy(conf_dialog);
 }
 
--- a/src/sun/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sun/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -57,26 +57,26 @@
 		sun_mixer_close();
 	}
 
-	cfgfile = bmp_cfg_db_open();
+	cfgfile = aud_cfg_db_open();
 
-	bmp_cfg_db_set_string(cfgfile, "sun",
+	aud_cfg_db_set_string(cfgfile, "sun",
 			      "audio_devaudio", audio.devaudio);
-	bmp_cfg_db_set_string(cfgfile, "sun",
+	aud_cfg_db_set_string(cfgfile, "sun",
 			      "audio_devaudioctl", audio.devaudioctl);
-	bmp_cfg_db_set_string(cfgfile, "sun",
+	aud_cfg_db_set_string(cfgfile, "sun",
 			      "audio_devmixer", audio.devmixer);
 
-	bmp_cfg_db_set_string(cfgfile, "sun",
+	aud_cfg_db_set_string(cfgfile, "sun",
 			      "mixer_voldev", audio.mixer_voldev);
-	bmp_cfg_db_set_bool(cfgfile, "sun",
+	aud_cfg_db_set_bool(cfgfile, "sun",
 			       "mixer_keepopen", audio.mixer_keepopen);
 
-	bmp_cfg_db_set_int(cfgfile, "sun",
+	aud_cfg_db_set_int(cfgfile, "sun",
 			   "buffer_size", audio.req_buffer_size);
-	bmp_cfg_db_set_int(cfgfile, "sun",
+	aud_cfg_db_set_int(cfgfile, "sun",
 			   "prebuffer_size", audio.req_prebuffer_size);
 
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_close(cfgfile);
 
 	configure_win_destroy();
 }
--- a/src/sun/sun.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/sun/sun.c	Thu Nov 01 15:38:07 2007 +0100
@@ -58,25 +58,25 @@
 
 	memset(&audio, 0, sizeof(struct sun_audio));
 
-	cfgfile = bmp_cfg_db_open();
+	cfgfile = aud_cfg_db_open();
 	/* Devices */
-	bmp_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio);
-	bmp_cfg_db_get_string(cfgfile, "sun",
+	aud_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio);
+	aud_cfg_db_get_string(cfgfile, "sun",
 			     "audio_devaudioctl", &audio.devaudioctl);
-	bmp_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer);
+	aud_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer);
 
 	/* Buffering */
-	bmp_cfg_db_get_int(cfgfile, "sun",
+	aud_cfg_db_get_int(cfgfile, "sun",
 			  "buffer_size", &audio.req_buffer_size);
-	bmp_cfg_db_get_int(cfgfile, "sun",
+	aud_cfg_db_get_int(cfgfile, "sun",
 			  "prebuffer_size", &audio.req_prebuffer_size);
 
 	/* Mixer */
-	bmp_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev);
-	bmp_cfg_db_get_bool(cfgfile, "sun",
+	aud_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev);
+	aud_cfg_db_get_bool(cfgfile, "sun",
 			      "mixer_keepopen", &audio.mixer_keepopen);
 
-	bmp_cfg_db_close(cfgfile);
+	aud_cfg_db_close(cfgfile);
 
 	/* Audio device path */
 	if ((s = getenv("AUDIODEVICE")))
--- a/src/timidity/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/timidity/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -22,4 +22,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/timidity/xmms-timidity.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/timidity/xmms-timidity.c	Thu Nov 01 15:38:07 2007 +0100
@@ -90,16 +90,16 @@
 	xmmstimid_cfg.channels = 2;
 	xmmstimid_cfg.buffer_size = 512;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
-	if (! bmp_cfg_db_get_string(db, "timidity", "config_file",
+	if (! aud_cfg_db_get_string(db, "timidity", "config_file",
                                 &xmmstimid_cfg.config_file))
         xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg");
 
-	bmp_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate);
-	bmp_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits);
-	bmp_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels);
-	bmp_cfg_db_close(db);
+	aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate);
+	aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits);
+	aud_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels);
+	aud_cfg_db_close(db);
 
 	if (mid_init(xmmstimid_cfg.config_file) != 0) {
 		xmmstimid_initialized = FALSE;
@@ -203,18 +203,18 @@
 	else if (gtk_toggle_button_get_active(xmmstimid_conf_channels_2))
 		xmmstimid_cfg.channels = 2;
 
-	db = bmp_cfg_db_open();
+	db = aud_cfg_db_open();
 
 	g_free(xmmstimid_cfg.config_file);
 	xmmstimid_cfg.config_file = g_strdup(
         gtk_entry_get_text(xmmstimid_conf_config_file));
 
-	bmp_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file);
+	aud_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file);
 
-	bmp_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate);
-	bmp_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits);
-	bmp_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels);
-	bmp_cfg_db_close(db);
+	aud_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate);
+	aud_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits);
+	aud_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels);
+	aud_cfg_db_close(db);
 
 	gtk_widget_hide(xmmstimid_conf_wnd);
 }
--- a/src/tta/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/tta/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -10,4 +10,5 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += -L${libdir} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -laudid3tag
+LDFLAGS += ${AUDLDFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -laudid3tag
--- a/src/vorbis/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/vorbis/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -12,4 +12,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/vorbis/configure.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/vorbis/configure.c	Thu Nov 01 15:38:07 2007 +0100
@@ -49,19 +49,19 @@
     else
         vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_ALBUM;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
-    bmp_cfg_db_set_bool(db, "vorbis", "tag_override",
+    aud_cfg_db_set_bool(db, "vorbis", "tag_override",
                         vorbis_cfg.tag_override);
-    bmp_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format);
-    bmp_cfg_db_set_bool(db, "vorbis", "use_anticlip",
+    aud_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format);
+    aud_cfg_db_set_bool(db, "vorbis", "use_anticlip",
                         vorbis_cfg.use_anticlip);
-    bmp_cfg_db_set_bool(db, "vorbis", "use_replaygain",
+    aud_cfg_db_set_bool(db, "vorbis", "use_replaygain",
                         vorbis_cfg.use_replaygain);
-    bmp_cfg_db_set_int(db, "vorbis", "replaygain_mode",
+    aud_cfg_db_set_int(db, "vorbis", "replaygain_mode",
                        vorbis_cfg.replaygain_mode);
-    bmp_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster);
-    bmp_cfg_db_close(db);
+    aud_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster);
+    aud_cfg_db_close(db);
     gtk_widget_destroy(vorbis_configurewin);
 }
 
--- a/src/vorbis/vorbis.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/vorbis/vorbis.c	Thu Nov 01 15:38:07 2007 +0100
@@ -63,13 +63,11 @@
 extern vorbis_config_t vorbis_cfg;
 
 static Tuple *get_song_tuple(gchar *filename);
-static int vorbis_check_file(char *filename);
 static int vorbis_check_fd(char *filename, VFSFile *stream);
 static void vorbis_play(InputPlayback *data);
 static void vorbis_stop(InputPlayback *data);
 static void vorbis_pause(InputPlayback *data, short p);
 static void vorbis_seek(InputPlayback *data, int time);
-static void vorbis_get_song_info(char *filename, char **title, int *length);
 static gchar *vorbis_generate_title(OggVorbis_File * vorbisfile, gchar * fn);
 static void vorbis_aboutbox(void);
 static void vorbis_init(void);
@@ -91,6 +89,13 @@
     ovcb_tell
 };
 
+ov_callbacks vorbis_callbacks_stream = {
+    ovcb_read,
+    NULL,
+    ovcb_close,
+    NULL
+};
+
 gchar *vorbis_fmts[] = { "ogg", "ogm", NULL };
 
 InputPlugin vorbis_ip = {
@@ -98,13 +103,11 @@
     .init = vorbis_init,                /* init */
     .about = vorbis_aboutbox,            /* aboutbox */
     .configure = vorbis_configure,           /* configure */
-    .is_our_file = vorbis_check_file,          /* is_our_file */
     .play_file = vorbis_play,
     .stop = vorbis_stop,
     .pause = vorbis_pause,
     .seek = vorbis_seek,
     .cleanup = vorbis_cleanup,
-    .get_song_info = vorbis_get_song_info,
     .file_info_box = vorbis_file_info_box,       /* file info box, tag editing */
     .get_song_tuple = get_song_tuple,
     .is_our_file_from_vfs = vorbis_check_fd,
@@ -118,8 +121,6 @@
 static OggVorbis_File vf;
 
 static GThread *thread;
-static int vorbis_is_streaming = 0;
-static int vorbis_bytes_streamed = 0;
 static volatile int seekneeded = -1;
 static int samplerate, channels;
 GMutex *vf_mutex;
@@ -127,89 +128,6 @@
 gchar **vorbis_tag_encoding_list = NULL;
 
 static int
-vorbis_check_file(char *filename)
-{
-    VFSFile *stream;
-    OggVorbis_File vfile;       /* avoid thread interaction */
-    gint result;
-    VFSVorbisFile *fd;
-
-    if (!(stream = aud_vfs_fopen(filename, "r"))) {
-        return FALSE;
-    }
-
-    fd = g_new0(VFSVorbisFile, 1);
-    fd->fd = stream;
-    fd->probe = TRUE;
-
-    /*
-     * The open function performs full stream detection and machine
-     * initialization.  If it returns zero, the stream *is* Vorbis and
-     * we're fully ready to decode.
-     */
-
-    /* libvorbisfile isn't thread safe... */
-    memset(&vfile, 0, sizeof(vfile));
-    g_mutex_lock(vf_mutex);
-
-    result = ov_test_callbacks(fd, &vfile, NULL, 0, vorbis_callbacks);
-
-    switch (result) {
-    case OV_EREAD:
-#ifdef DEBUG
-        g_message("** vorbis.c: Media read error: %s", filename);
-#endif
-        g_mutex_unlock(vf_mutex);
-        aud_vfs_fclose(stream);
-        return FALSE;
-        break;
-    case OV_ENOTVORBIS:
-#ifdef DEBUG
-        g_message("** vorbis.c: Not Vorbis data: %s", filename);
-#endif
-        g_mutex_unlock(vf_mutex);
-        aud_vfs_fclose(stream);
-        return FALSE;
-        break;
-    case OV_EVERSION:
-#ifdef DEBUG
-        g_message("** vorbis.c: Version mismatch: %s", filename);
-#endif
-        g_mutex_unlock(vf_mutex);
-        aud_vfs_fclose(stream);
-        return FALSE;
-        break;
-    case OV_EBADHEADER:
-#ifdef DEBUG
-        g_message("** vorbis.c: Invalid Vorbis bistream header: %s",
-                  filename);
-#endif
-        g_mutex_unlock(vf_mutex);
-        aud_vfs_fclose(stream);
-        return FALSE;
-        break;
-    case OV_EFAULT:
-#ifdef DEBUG
-        g_message("** vorbis.c: Internal logic fault while reading %s",
-                  filename);
-#endif
-        g_mutex_unlock(vf_mutex);
-        aud_vfs_fclose(stream);
-        return FALSE;
-        break;
-    case 0:
-        break;
-    default:
-        break;
-    }
-
-    ov_clear(&vfile);           /* once the ov_open succeeds, the stream belongs to
-                                   vorbisfile.a.  ov_clear will fclose it */
-    g_mutex_unlock(vf_mutex);
-    return TRUE;
-}
-
-static int
 vorbis_check_fd(char *filename, VFSFile *stream)
 {
     OggVorbis_File vfile;       /* avoid thread interaction */
@@ -230,7 +148,7 @@
     memset(&vfile, 0, sizeof(vfile));
     g_mutex_lock(vf_mutex);
 
-    result = ov_test_callbacks(fd, &vfile, NULL, 0, vorbis_callbacks);
+    result = ov_test_callbacks(fd, &vfile, NULL, 0, aud_vfs_is_streaming(stream) ? vorbis_callbacks_stream : vorbis_callbacks);
 
     switch (result) {
     case OV_EREAD:
@@ -304,7 +222,7 @@
 static void
 do_seek(InputPlayback *playback)
 {
-    if (seekneeded != -1 && !vorbis_is_streaming) {
+    if (seekneeded != -1) {
         vorbis_jump_to_time(playback, seekneeded);
         seekneeded = -1;
         playback->eof = FALSE;
@@ -438,7 +356,7 @@
      */
 
     g_mutex_lock(vf_mutex);
-    if (ov_open_callbacks(datasource, &vf, NULL, 0, vorbis_callbacks) < 0) {
+    if (ov_open_callbacks(datasource, &vf, NULL, 0, aud_vfs_is_streaming(fd->fd) ? vorbis_callbacks_stream : vorbis_callbacks) < 0) {
         vorbis_callbacks.close_func(datasource);
         g_mutex_unlock(vf_mutex);
         playback->eof = TRUE;
@@ -446,14 +364,10 @@
     }
     vi = ov_info(&vf, -1);
 
-    /* XXX this isn't very correct, but it works */
-    vorbis_is_streaming = ((time = ov_time_total(&vf, -1)) <= 1.);
-
-    if (vorbis_is_streaming)
-    {
+    if (aud_vfs_is_streaming(fd->fd))
         time = -1;
-	vf.seekable = FALSE;   /* XXX: don't ask. -nenolod */
-    }
+    else
+        time = ov_time_total(&vf, -1) * 1000;
 
     if (vi->channels > 2) {
         playback->eof = TRUE;
@@ -513,9 +427,7 @@
             title = vorbis_generate_title(&vf, filename);
             use_rg = vorbis_update_replaygain(&rg_scale);
 
-            if (vorbis_is_streaming)
-                time = -1;
-            else
+            if (time != -1)
                 time = ov_time_total(&vf, -1) * 1000;
 
             g_mutex_unlock(vf_mutex);
@@ -540,7 +452,6 @@
     g_mutex_lock(vf_mutex);
     ov_clear(&vf);
     g_mutex_unlock(vf_mutex);
-    vorbis_is_streaming = 0;
     playback->playing = 0;
     return NULL;
 }
@@ -549,7 +460,6 @@
 vorbis_play(InputPlayback *playback)
 {
     playback->playing = 1;
-    vorbis_bytes_streamed = 0;
     playback->eof = 0;
     playback->error = FALSE;
 
@@ -576,38 +486,12 @@
 static void
 vorbis_seek(InputPlayback *data, int time)
 {
-    if (vorbis_is_streaming)
-        return;
-
     seekneeded = time;
 
     while (seekneeded != -1)
         g_usleep(20000);
 }
 
-static void
-vorbis_get_song_info(char *filename, char **title, int *length)
-{
-    Tuple *tuple = get_song_tuple(filename);
-
-    *length = aud_tuple_get_int(tuple, FIELD_LENGTH, NULL);
-    *title = aud_tuple_formatter_make_title_string(tuple, vorbis_cfg.tag_override ?
-                                            vorbis_cfg.tag_format : aud_get_gentitle_format());
-
-    aud_tuple_free(tuple);
-}
-
-/*
-static const gchar *
-get_extension(const gchar * filename)
-{
-    const gchar *ext;
-    if ((ext = strrchr(filename, '.')))
-        ++ext;
-    return ext;
-}
-*/
-
 /* Make sure you've locked vf_mutex */
 static gboolean
 vorbis_update_replaygain(float *scale)
@@ -728,22 +612,29 @@
  * Ok, nhjm449! Are you *happy* now?!  -nenolod
  */
 static Tuple *
-get_aud_tuple_for_vorbisfile(OggVorbis_File * vorbisfile, gchar *filename, gboolean is_stream)
+get_aud_tuple_for_vorbisfile(OggVorbis_File * vorbisfile, gchar *filename)
 {
+    VFSVorbisFile *vfd = (VFSVorbisFile *) vorbisfile->datasource;
     Tuple *tuple = NULL;
+    gint length;
     vorbis_comment *comment;
+
     tuple = aud_tuple_new_from_filename(filename);
 
-    /* Retrieve the length */
-    aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL,
-        is_stream ? -1 : (ov_time_total(vorbisfile, -1) * 1000));
+    if (aud_vfs_is_streaming(vfd->fd))
+        length = -1;
+    else
+        length = ov_time_total(vorbisfile, -1) * 1000;
+
+    /* associate with tuple */
+    aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
 
     if ((comment = ov_comment(vorbisfile, -1))) {
         gchar *tmps;
         _aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, vorbis_comment_query(comment, "title", 0));
         _aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, vorbis_comment_query(comment, "artist", 0));
         _aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, vorbis_comment_query(comment, "album", 0));
-        _aud_tuple_associate_string(tuple, -1, "date", vorbis_comment_query(comment, "date", 0));
+        _aud_tuple_associate_string(tuple, FIELD_DATE, NULL, vorbis_comment_query(comment, "date", 0));
         _aud_tuple_associate_string(tuple, FIELD_GENRE, NULL, vorbis_comment_query(comment, "genre", 0));
         _aud_tuple_associate_string(tuple, FIELD_COMMENT, NULL, vorbis_comment_query(comment, "comment", 0));
 
@@ -771,7 +662,6 @@
     VFSFile *stream = NULL;
     OggVorbis_File vfile;          /* avoid thread interaction */
     Tuple *tuple = NULL;
-    gboolean is_stream = FALSE;
     VFSVorbisFile *fd = NULL;
 
     if ((stream = aud_vfs_fopen(filename, "r")) == NULL)
@@ -785,13 +675,12 @@
      * machine initialization.  If it returns zero, the stream
      * *is* Vorbis and we're fully ready to decode.
      */
-    if (ov_open_callbacks(fd, &vfile, NULL, 0, vorbis_callbacks) < 0) {
-        if (is_stream == FALSE)
-            aud_vfs_fclose(stream);
+    if (ov_open_callbacks(fd, &vfile, NULL, 0, aud_vfs_is_streaming(stream) ? vorbis_callbacks_stream : vorbis_callbacks) < 0) {
+        aud_vfs_fclose(stream);
         return NULL;
     }
 
-    tuple = get_aud_tuple_for_vorbisfile(&vfile, filename, is_stream);
+    tuple = get_aud_tuple_for_vorbisfile(&vfile, filename);
 
     /*
      * once the ov_open succeeds, the stream belongs to
@@ -810,7 +699,7 @@
     Tuple *input;
     gchar *tmp;
 
-    input = get_aud_tuple_for_vorbisfile(vorbisfile, filename, vorbis_is_streaming);
+    input = get_aud_tuple_for_vorbisfile(vorbisfile, filename);
 
     displaytitle = aud_tuple_formatter_make_title_string(input, vorbis_cfg.tag_override ?
                                                   vorbis_cfg.tag_format : aud_get_gentitle_format());
@@ -887,42 +776,42 @@
     vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_TRACK;
     vorbis_cfg.use_booster = FALSE;
 
-    db = bmp_cfg_db_open();
-    bmp_cfg_db_get_int(db, "vorbis", "http_buffer_size",
+    db = aud_cfg_db_open();
+    aud_cfg_db_get_int(db, "vorbis", "http_buffer_size",
                        &vorbis_cfg.http_buffer_size);
-    bmp_cfg_db_get_int(db, "vorbis", "http_prebuffer",
+    aud_cfg_db_get_int(db, "vorbis", "http_prebuffer",
                        &vorbis_cfg.http_prebuffer);
-    bmp_cfg_db_get_bool(db, "vorbis", "save_http_stream",
+    aud_cfg_db_get_bool(db, "vorbis", "save_http_stream",
                         &vorbis_cfg.save_http_stream);
-    if (!bmp_cfg_db_get_string(db, "vorbis", "save_http_path",
+    if (!aud_cfg_db_get_string(db, "vorbis", "save_http_path",
                                &vorbis_cfg.save_http_path))
         vorbis_cfg.save_http_path = g_strdup(g_get_home_dir());
 
-    bmp_cfg_db_get_bool(db, "vorbis", "tag_override",
+    aud_cfg_db_get_bool(db, "vorbis", "tag_override",
                         &vorbis_cfg.tag_override);
-    if (!bmp_cfg_db_get_string(db, "vorbis", "tag_format",
+    if (!aud_cfg_db_get_string(db, "vorbis", "tag_format",
                                &vorbis_cfg.tag_format))
         vorbis_cfg.tag_format = g_strdup("%p - %t");
-    bmp_cfg_db_get_bool(db, "vorbis", "use_anticlip",
+    aud_cfg_db_get_bool(db, "vorbis", "use_anticlip",
                         &vorbis_cfg.use_anticlip);
-    bmp_cfg_db_get_bool(db, "vorbis", "use_replaygain",
+    aud_cfg_db_get_bool(db, "vorbis", "use_replaygain",
                         &vorbis_cfg.use_replaygain);
-    bmp_cfg_db_get_int(db, "vorbis", "replaygain_mode",
+    aud_cfg_db_get_int(db, "vorbis", "replaygain_mode",
                        &vorbis_cfg.replaygain_mode);
-    bmp_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster);
+    aud_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster);
 
-    bmp_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy);
-    bmp_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host);
-    bmp_cfg_db_get_string(db, NULL, "proxy_port", &tmp);
+    aud_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy);
+    aud_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host);
+    aud_cfg_db_get_string(db, NULL, "proxy_port", &tmp);
 
     if (tmp != NULL)
 	vorbis_cfg.proxy_port = atoi(tmp);
 
-    bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth);
-    bmp_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user);
-    bmp_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass);
+    aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth);
+    aud_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user);
+    aud_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass);
 
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     vf_mutex = g_mutex_new();
 
--- a/src/vtx/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/vtx/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -15,4 +15,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/vtx/vtx.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/vtx/vtx.c	Thu Nov 01 15:38:07 2007 +0100
@@ -61,13 +61,13 @@
 vtx_init(void)
 {
         ConfigDb *db;
-        db = bmp_cfg_db_open();
+        db = aud_cfg_db_open();
 
-        bmp_cfg_db_get_int(db, NULL, "src_rate", &freq);
+        aud_cfg_db_get_int(db, NULL, "src_rate", &freq);
         if (freq < 4000 || freq > 192000)
                 freq = 44100;
 
-        bmp_cfg_db_close(db);
+        aud_cfg_db_close(db);
 }
 
 int
--- a/src/wavpack/Makefile	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/wavpack/Makefile	Thu Nov 01 15:38:07 2007 +0100
@@ -12,4 +12,4 @@
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${WAVPACK_CFLAGS} -I../../intl -I../..
 CXXFLAGS += ${PLUGIN_CFLAGS}
 LDFLAGS += -lstdc++
-LIBS += ${WAVPACK_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${WAVPACK_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
--- a/src/wavpack/libwavpack.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/wavpack/libwavpack.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -532,15 +532,15 @@
 {
     ConfigDb *cfg;
 
-    cfg = bmp_cfg_db_open();
+    cfg = aud_cfg_db_open();
 
-    bmp_cfg_db_get_bool(cfg, "wavpack", "clip_prevention",
+    aud_cfg_db_get_bool(cfg, "wavpack", "clip_prevention",
                           &clipPreventionEnabled);
-    bmp_cfg_db_get_bool(cfg, "wavpack", "album_replaygain",
+    aud_cfg_db_get_bool(cfg, "wavpack", "album_replaygain",
                           &albumReplaygainEnabled);
-    bmp_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled);
-    bmp_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled);
-    bmp_cfg_db_close(cfg);
+    aud_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled);
+    aud_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled);
+    aud_cfg_db_close(cfg);
 
     openedAudio = false;
 }
--- a/src/wavpack/ui.cxx	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/wavpack/ui.cxx	Thu Nov 01 15:38:07 2007 +0100
@@ -428,15 +428,15 @@
     tb = GTK_TOGGLE_BUTTON(rg_track_gain);
     albumReplaygainEnabled = !gtk_toggle_button_get_active(tb);
 
-    cfg = bmp_cfg_db_open();
+    cfg = aud_cfg_db_open();
 
-    bmp_cfg_db_set_bool(cfg, "wavpack", "clip_prevention",
+    aud_cfg_db_set_bool(cfg, "wavpack", "clip_prevention",
                            clipPreventionEnabled);
-    bmp_cfg_db_set_bool(cfg, "wavpack", "album_replaygain",
+    aud_cfg_db_set_bool(cfg, "wavpack", "album_replaygain",
                            albumReplaygainEnabled);
-    bmp_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled);
-    bmp_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled);
-    bmp_cfg_db_close(cfg);
+    aud_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled);
+    aud_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled);
+    aud_cfg_db_close(cfg);
     gtk_widget_destroy(wv_configurewin);
 }
 
--- a/src/wma/wma.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/wma/wma.c	Thu Nov 01 15:38:07 2007 +0100
@@ -45,22 +45,9 @@
 #include "avcodec.h"
 #include "avformat.h"
 
-#define ABOUT_TXT "Adapted for use in audacious by Tony Vroon (chainsaw@gentoo.org) from\n \
-the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n \
-and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>.\n \
-This plugin based on source code " LIBAVCODEC_IDENT "\nby Fabrice Bellard from \
-http://ffmpeg.sourceforge.net.\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. \n \
-See the GNU General Public License for more details.\n"
-#define PLUGIN_NAME "Audacious-WMA"
-#define PLUGIN_VERSION "v.1.0.5"
-#define ST_BUFF 1024
+static const gchar * PLUGIN_NAME = "Audacious-WMA";
+static const gchar * PLUGIN_VERSION = "v.1.0.5";
+static const int ST_BUFF = 1024;
 
 static int wma_decode = 0;
 static gboolean wma_pause = 0;
@@ -134,18 +121,32 @@
     char *message;
 
     if (dialog1) return;
-    
+
     title = (char *)g_malloc(80);
     message = (char *)g_malloc(1000);
     memset(title, 0, 80);
     memset(message, 0, 1000);
 
     sprintf(title, _("About %s"), PLUGIN_NAME);
-    sprintf(message, "%s %s\n\n%s", PLUGIN_NAME, PLUGIN_VERSION, ABOUT_TXT);
+    sprintf(message, "%s %s\n\n%s", PLUGIN_NAME, PLUGIN_VERSION,
+            _("Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
+              "the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n"
+              "and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>.\n"
+              "This plugin based on source code " LIBAVCODEC_IDENT "\nby Fabrice Bellard from"
+              "http://ffmpeg.sourceforge.net.\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. \n"
+              "See the GNU General Public License for more details.\n"
+             ));
 
     dialog1 = gtk_dialog_new();
     g_signal_connect(G_OBJECT(dialog1), "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &dialog1);
+                     G_CALLBACK(gtk_widget_destroyed), &dialog1);
     gtk_window_set_title(GTK_WINDOW(dialog1), title);
     gtk_window_set_policy(GTK_WINDOW(dialog1), FALSE, FALSE, FALSE);
     gtk_container_border_width(GTK_CONTAINER(dialog1), 5);
@@ -155,10 +156,10 @@
 
     button1 = gtk_button_new_with_label(_(" Close "));
     g_signal_connect_swapped(G_OBJECT(button1), "clicked",
-	                        G_CALLBACK(gtk_widget_destroy),
-    	                        GTK_OBJECT(dialog1));
+                             G_CALLBACK(gtk_widget_destroy),
+                             GTK_OBJECT(dialog1));
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog1)->action_area), button1,
-                     FALSE, FALSE, 0);
+                       FALSE, FALSE, 0);
 
     gtk_widget_show(button1);
     gtk_widget_show(dialog1);
@@ -191,9 +192,9 @@
 
     if(!codec2) {
         av_close_input_file(ic2);
-	return 0;
+        return 0;
     }
-	
+
     av_close_input_file(ic2);
     return 1;
 }
@@ -236,13 +237,6 @@
     if(wma_pause) playback->output->pause(1);
 }
 
-static gchar *extname(const char *filename)
-{
-    gchar *ext = strrchr(filename, '.');
-    if(ext != NULL) ++ext;
-    return ext;
-}
-
 static void _assoc_string(Tuple *tuple, const gint nfield, const gchar *str)
 {
     if (strlen(str) > 0)
@@ -261,7 +255,7 @@
     AVFormatContext *in = NULL;
 
     if (av_open_input_file(&in, str_twenty_to_space(filename), NULL, 0, NULL) < 0)
-	return NULL;
+        return NULL;
 
     aud_tuple_associate_string(ti, FIELD_CODEC, NULL, "Windows Media Audio (WMA)");
     aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, "lossy");
@@ -298,7 +292,7 @@
     _assoc_int(ti, FIELD_YEAR, in->year);
     _assoc_int(ti, FIELD_TRACK_NUMBER, in->track);
     _assoc_int(ti, FIELD_LENGTH, in->duration / 1000);
-    
+
     ret = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format());
 
     return ret;
@@ -307,9 +301,9 @@
 static guint get_song_time(AVFormatContext *in)
 {
     if(in->duration)
-	return in->duration/1000;
+        return in->duration/1000;
     else
-	return 0;
+        return 0;
 }
 
 static void wma_get_song_info(char *filename, char **title_real, int *len_real)
@@ -327,16 +321,16 @@
 {
     FifoBuffer f;
     int sst_buff;
-    
+
     fifo_init(&f, out_size*2);
     fifo_write(&f, wma_outbuf, out_size, &f.wptr);
     while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode)
     {
         sst_buff = wma_st_buff;
-	if(wma_pause) memset(wma_s_outbuf, 0, sst_buff);	
-	playback->pass_audio(playback, FMT_S16_NE,
-            c->channels, sst_buff, (short *)wma_s_outbuf, NULL);
-	memset(wma_s_outbuf, 0, sst_buff);
+        if(wma_pause) memset(wma_s_outbuf, 0, sst_buff);    
+        playback->pass_audio(playback, FMT_S16_NE,
+                             c->channels, sst_buff, (short *)wma_s_outbuf, NULL);
+        memset(wma_s_outbuf, 0, sst_buff);
     }
     fifo_free(&f);
     return;
@@ -348,32 +342,32 @@
     uint8_t *inbuf_ptr;
     int out_size, size, len;
     AVPacket pkt;
-    
+
     g_static_mutex_lock(&wma_mutex);
     while(playback->playing)
     {
-	if(wma_seekpos != -1)
-	{
-	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
-	    playback->output->flush(wma_seekpos * 1000);
-	    wma_seekpos = -1;
-	}
+        if(wma_seekpos != -1)
+        {
+            av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
+            playback->output->flush(wma_seekpos * 1000);
+            wma_seekpos = -1;
+        }
 
         if(av_read_frame(ic, &pkt) < 0) break;
 
         size = pkt.size;
         inbuf_ptr = pkt.data;
-	
+
         if(size == 0) break;
-	
+
         while(size > 0){
             len = avcodec_decode_audio(c, (short *)wma_outbuf, &out_size,
                                        inbuf_ptr, size);
-	    if(len < 0) break;
-	    
+            if(len < 0) break;
+
             if(out_size <= 0) continue;
 
-	    wma_playbuff(playback, out_size);
+            wma_playbuff(playback, out_size);
 
             size -= len;
             inbuf_ptr += len;
@@ -395,7 +389,7 @@
 {
     char *filename = playback->filename;
     AVCodec *codec;
-    
+
     if(av_open_input_file(&ic, filename, NULL, 0, NULL) < 0) return;
 
     for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
@@ -408,16 +402,16 @@
     codec = avcodec_find_decoder(c->codec_id);
 
     if(!codec) return;
-	
+
     if(avcodec_open(c, codec) < 0) return;
-	    	    
+
     wsong_title = get_song_title(ic, filename);
     wsong_time = get_song_time(ic);
 
     if(playback->output->open_audio(FMT_S16_NE, c->sample_rate, c->channels) <= 0) return;
 
     wma_st_buff  = ST_BUFF;
-	
+
     playback->set_params(playback, wsong_title, wsong_time, c->bit_rate, c->sample_rate, c->channels);
 
     /* av_malloc() will wrap posix_memalign() if necessary -nenolod */
@@ -439,4 +433,4 @@
     if(wma_pause) wma_do_pause(playback, 0);
     g_thread_join(wma_decode_thread);
     playback->output->close_audio();
-}	
+}   
--- a/src/xspf/xspf.c	Thu Nov 01 15:37:43 2007 +0100
+++ b/src/xspf/xspf.c	Thu Nov 01 15:38:07 2007 +0100
@@ -145,13 +145,6 @@
 
                 location = g_strdup_printf("%s%s", base ? base : "", str);
                 xmlFree(str);
-                str = g_filename_from_uri(location, NULL, NULL);
-                if (str) {
-                    g_free(location);
-                    location = g_strdup_printf("file://%s", str);
-                }
-            
-                g_free(str);
             } else {
                 /* Rest of the nodes are handled here */
                 gint i;