changeset 1612:4c7d549bb593

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Fri, 07 Sep 2007 04:04:03 -0500
parents f49d1284079a (current diff) e22d2f840d87 (diff)
children 4eeeef9adab3
files src/sid/xs_title.c src/sid/xs_title.h
diffstat 60 files changed, 8322 insertions(+), 7541 deletions(-) [+]
line wrap: on
line diff
--- a/po/audacious-plugins.pot	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/audacious-plugins.pot	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -38,7 +38,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -81,8 +81,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -116,14 +116,14 @@
 msgstr ""
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
 #: src/timidity/src/interface.c:167
 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:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr ""
 
@@ -228,28 +228,28 @@
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 msgid "Speed: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 msgid "Timer: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr ""
 
@@ -284,8 +284,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr ""
 
@@ -299,10 +299,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr ""
 
@@ -352,6 +352,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 msgid "Quiet after:"
 msgstr ""
@@ -411,10 +415,10 @@
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 msgid "seconds"
 msgstr ""
 
@@ -1180,8 +1184,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr ""
 
@@ -1422,10 +1426,10 @@
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr ""
 
@@ -1506,7 +1510,7 @@
 msgstr ""
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 msgid "Misc"
 msgstr ""
 
@@ -1771,7 +1775,7 @@
 msgstr ""
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr ""
 
@@ -2070,7 +2074,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr ""
@@ -2189,11 +2193,11 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2213,63 +2217,63 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:197
+#: 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:512
+#: src/filewriter/filewriter.c:514
 msgid "File Writer Configuration"
 msgstr ""
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 msgid "Configure"
 msgstr ""
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2675,8 +2679,7 @@
 msgid "ID3 format:"
 msgstr ""
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr ""
 
@@ -3103,8 +3106,8 @@
 msgid "Use Album Gain"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr ""
 
@@ -3116,8 +3119,8 @@
 msgid "Track:"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr ""
 
@@ -3365,152 +3368,133 @@
 msgid "Scrobbler Error"
 msgstr ""
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-msgid "Subtune Control"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-msgid "Audacious-SID Configuration"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+msgid "Audacious-SID configuration"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 msgid "8-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 msgid "16-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 msgid "Resolution:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 msgid "Samplerate:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 msgid "Use oversampling"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 msgid "Oversampling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3518,89 +3502,89 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 msgid "SID model:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 msgid "Memory mode:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -3609,47 +3593,47 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 msgid "Resampling (FIR)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 msgid "reSID sampling options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -3657,367 +3641,271 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+msgid "Export"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 msgid "Import"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-msgid "Export"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+msgid "Delete"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 msgid "Filter curve:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 msgid "Playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 msgid "DB-file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+msgid "Sub-tune handling:"
+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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 msgid "STIL file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-msgid "Override generic XMMS titles"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-msgid "Song name/title format:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-msgid "No sub-tune control."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-msgid "Sub-tune control:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 msgid "Song Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 msgid "Duration:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 msgid "Sub-tune Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+msgid "Confirm selected action"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+msgid "Yes"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+msgid "No"
+msgstr ""
+
+#: src/sid/xs_fileinfo.c:238
 msgid "General info"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4040,32 +3928,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4102,72 +3990,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
--- a/po/ca.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/ca.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -38,7 +38,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -92,8 +92,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -131,14 +131,14 @@
 msgstr "Canals"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Estèreo"
 
@@ -249,30 +249,30 @@
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Parlat"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Títol:"
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -308,8 +308,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Tanca"
 
@@ -323,10 +323,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "D'acord"
 
@@ -379,6 +379,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -441,10 +445,10 @@
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "segons"
@@ -1263,8 +1267,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Nom:"
 
@@ -1511,10 +1515,10 @@
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr ""
 
@@ -1600,7 +1604,7 @@
 msgstr "Tràiler"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Disco"
@@ -1885,7 +1889,7 @@
 msgstr "Duració per defecte:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Remostreig"
 
@@ -2220,7 +2224,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Error"
@@ -2349,12 +2353,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Quant al plugin per a Scrobbler"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2391,7 +2395,7 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2400,60 +2404,60 @@
 "No podeu utilitzar el plugin d'escriptura\n"
 "al disc en mode de temps real."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Configuració de l'escriptura al disc"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Directori de sortida:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Configuració de l'eco"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Directori de sortida:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr "Trieu un directori"
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Deixa l'extensió del fitxer"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2904,8 +2908,7 @@
 msgid "ID3 format:"
 msgstr "Format ID3:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Títol"
 
@@ -3359,8 +3362,8 @@
 msgid "Use Album Gain"
 msgstr "usa el guany/pic del disc"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom d'usuari:"
@@ -3374,8 +3377,8 @@
 msgid "Track:"
 msgstr "Guany de la pista:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Rave"
@@ -3684,159 +3687,139 @@
 msgid "Scrobbler Error"
 msgstr "Plugin per a Scrobbler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Control del volum:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Configuració del plugin d'àudio MPEG"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bits"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bits"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 msgid "Resolution:"
 msgstr "Resolució:"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Canals:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Freqüència de mostreig:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3844,91 +3827,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -3937,49 +3920,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Remostreig"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Taxa de remostreig:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -3987,377 +3970,280 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+msgid "Export"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 msgid "Import"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-msgid "Export"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "Per defecte"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Mida del fitxer:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Mode de reproducció:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 msgid "DB-file:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Duració per defecte:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Control del volum:"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Títol:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Ignora els títols genèrics"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Format del títol:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Control del volum:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Control del volum:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 msgid "Song Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Descripció:"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 msgid "Sub-tune Information:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+msgid "Confirm selected action"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "Sí"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+msgid "No"
+msgstr "No"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "General"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4380,32 +4266,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4442,72 +4328,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -5792,6 +5683,22 @@
 msgstr "Quant a %s"
 
 #, fuzzy
+#~ msgid "Subtune Control"
+#~ msgstr "Control del volum:"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ 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:"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Hz"
 
@@ -6006,9 +5913,6 @@
 #~ msgid "CCIT J.17"
 #~ msgstr "CCIT J.17"
 
-#~ msgid "No"
-#~ msgstr "No"
-
 #~ msgid "MPEG Level:"
 #~ msgstr "Nivell d'MPEG:"
 
--- a/po/cs.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/cs.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -40,7 +40,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -92,8 +92,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -130,14 +130,14 @@
 msgstr "Kanálů"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -253,30 +253,30 @@
 msgid "Subsong selection"
 msgstr "Výběr backendu"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Mluvené"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Filtr: "
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -312,8 +312,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Zavřít"
 
@@ -328,10 +328,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "Budiž"
 
@@ -385,6 +385,11 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+#, fuzzy
+msgid "minutes"
+msgstr "Čáry"
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -449,10 +454,10 @@
 msgid "Fading"
 msgstr "Rozsvícení:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "s"
@@ -1391,8 +1396,8 @@
 "backend</span>"
 msgstr "<span size=\"small\">def</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1647,10 +1652,10 @@
 msgid "Skin file:"
 msgstr "Soubor se skinem:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "Procházet"
 
@@ -1733,7 +1738,7 @@
 msgstr "Spouštěč"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
@@ -2033,7 +2038,7 @@
 msgstr "Implicitní délka skladby:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Převzorkování"
 
@@ -2388,7 +2393,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:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Chyba"
@@ -2532,12 +2537,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "O modulu Flac"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2572,7 +2577,7 @@
 "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:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2581,60 +2586,60 @@
 "Disk writer nelze použít, pokud\n"
 "jste v režimu reálného času."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Nastavení Disk Writeru"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Nastavit ozvěnu"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Nezkracovat příponu jména souboru"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -3095,8 +3100,7 @@
 msgid "ID3 format:"
 msgstr "Formát ID3:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Název"
 
@@ -3560,8 +3564,8 @@
 msgid "Use Album Gain"
 msgstr "použít zesílení/vrchol alba"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "Jméno souboru:"
 
@@ -3574,8 +3578,8 @@
 msgid "Track:"
 msgstr "Zesílení skladby:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Uložit"
 
@@ -3877,161 +3881,141 @@
 msgid "Scrobbler Error"
 msgstr "Modul Scrobbler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Ovládání hlasitosti:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, fuzzy, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "OSD pro Audacious – nastavení"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bitů"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bitů"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 msgid "Resolution:"
 msgstr "Rozlišení:"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Kanálů"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Vzorkovací kmitočet:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Tempo přehrávání"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 #, fuzzy
 msgid "Force model"
 msgstr "Režim stopy"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -4039,92 +4023,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Způsob přehrávání:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transponovat: "
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mód mmap"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -4133,50 +4117,50 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 #, fuzzy
 msgid "SIDPlay 2 options:"
 msgstr "Hrát z adresy"
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Převzorkování"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Převzorkovat na:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4184,391 +4168,293 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 #, fuzzy
 msgid "Emulate filters"
 msgstr "Přehrát soubory"
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 #, fuzzy
 msgid "SIDPlay1"
 msgstr "Hrát"
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr "Načíst"
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
-msgid "Import"
-msgstr "Importovat"
-
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
 #, fuzzy
 msgid "Export"
 msgstr "Importovat"
 
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
+msgid "Import"
+msgstr "Importovat"
+
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+msgid "Delete"
+msgstr "Smazat"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Filtr: "
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 #, fuzzy
 msgid "SIDPlay2"
 msgstr "Hrát"
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 #, fuzzy
 msgid "Filters"
 msgstr "Filtr: "
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Hrát normální rychlostí"
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Způsob přehrávání:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Soubor zařízení:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Implicitní délka skladby:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+#, 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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Ovládání hlasitosti:"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Do soubu"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Přepsat původní názvy"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Formát názvu:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Ovládání hlasitosti:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-#, fuzzy
-msgid "Disabled"
-msgstr "Povolený"
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Ovládání hlasitosti:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-#, fuzzy
-msgid "Miscellaneous options:"
-msgstr "<b>Různé</b>"
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr "Modul Audacious"
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 #, fuzzy
 msgid "Songname:"
 msgstr "Snížit vzorkovací kmitočet:"
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Autorská práva:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 #, fuzzy
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Výzdoba"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, 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
+#, fuzzy
+msgid "Yes"
+msgstr "ano"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+msgid "No"
+msgstr "Ne"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "Obecné"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4592,32 +4478,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4654,72 +4540,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -6011,6 +5902,37 @@
 msgstr "O %s"
 
 #, 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"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ 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:"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "Povolený"
+
+#, fuzzy
+#~ msgid "Miscellaneous options:"
+#~ msgstr "<b>Různé</b>"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Hz"
 
@@ -6971,9 +6893,6 @@
 #~ msgid "Vertical Lines"
 #~ msgstr "Svislé čáry"
 
-#~ msgid "Lines"
-#~ msgstr "Čáry"
-
 #~ msgid "Line Scope"
 #~ msgstr "Čárová vlnovka"
 
@@ -7100,9 +7019,6 @@
 #~ msgid "Add Files..."
 #~ msgstr "Přidat soubory…"
 
-#~ msgid "Adds files to the playlist."
-#~ msgstr "Do seznamu skladeb přidá soubory."
-
 #~ msgid "Search and Select"
 #~ msgstr "Hledání a výběr"
 
@@ -7267,9 +7183,6 @@
 #~ msgid "Enables/disables the entry in the playlist's queue."
 #~ msgstr "Povolí/zakáže položku ve frontě seznamu skladeb."
 
-#~ msgid "Delete"
-#~ msgstr "Smazat"
-
 #~ msgid "Load preset"
 #~ msgstr "Načíst předvolbu"
 
@@ -8200,9 +8113,6 @@
 #~ msgid "CCIT J.17"
 #~ msgstr "CCIT J.17"
 
-#~ msgid "No"
-#~ msgstr "Ne"
-
 #~ msgid "MPEG Level:"
 #~ msgstr "MPEG:"
 
--- a/po/cy.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/cy.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -38,7 +38,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -91,8 +91,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -130,14 +130,14 @@
 msgstr "Sianeli:"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -250,30 +250,30 @@
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Llais"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Teitl:"
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -309,8 +309,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Cau"
 
@@ -324,10 +324,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "Iawn"
 
@@ -380,6 +380,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -443,10 +447,10 @@
 msgid "Fading"
 msgstr "cynnydd"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "eiliad"
@@ -1241,8 +1245,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Enw:"
 
@@ -1487,10 +1491,10 @@
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr ""
 
@@ -1574,7 +1578,7 @@
 msgstr "Trailer"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Disgo"
@@ -1869,7 +1873,7 @@
 msgstr "Hyd cân rhagosodedig:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Samplo"
 
@@ -2203,7 +2207,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Gwall"
@@ -2332,12 +2336,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Ynghylch Ategyn Echo"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2374,7 +2378,7 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2384,60 +2388,60 @@
 "\n"
 "pan fyddwch yn rhedeg ym modd realtime."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Ffurfweddiad Disk Writer"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Ffurfweddu Echo"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr "Dewis cyfeiriadur"
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Cadw enw ffeil estyniad"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2879,8 +2883,7 @@
 msgid "ID3 format:"
 msgstr "Fformat ID3:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Teitl"
 
@@ -3335,8 +3338,8 @@
 msgid "Use Album Gain"
 msgstr "defnyddio Cynnydd/Brig Albwm"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 #, fuzzy
 msgid "Filename:"
 msgstr "Enw Defnyddiwr:"
@@ -3350,8 +3353,8 @@
 msgid "Track:"
 msgstr "Cynnydd trac:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Rave"
@@ -3660,162 +3663,142 @@
 msgid "Scrobbler Error"
 msgstr "Ategyn Scrobbler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Rheolwr sain"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Audacious OSD - ffurfweddiad"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 did"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 did"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 #, fuzzy
 msgid "Resolution:"
 msgstr "Cydraniad:"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Sianeli:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Graddfa samplo:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Chwarae cyflymedd"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 #, fuzzy
 msgid "Force model"
 msgstr "Enwau'r Traciau:"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3823,91 +3806,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -3916,49 +3899,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Samplo"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Graddfa Samplo"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -3966,385 +3949,288 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#, fuzzy
+msgid "Export"
+msgstr "Porth"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 #, fuzzy
 msgid "Import"
 msgstr "Porth"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-#, fuzzy
-msgid "Export"
-msgstr "Porth"
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "Rhagosodedig"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Maint ffeil:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Modd chwarae:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Dyfais:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Hyd cân rhagosodedig:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Rheolwr sain"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Teitl:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Diystyru'r teitlau cyffredinol"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Fformat y teitl:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Rheolwr sain"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Rheolwr sain"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD"
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Hawlfraint:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Fformat ID3:"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Addurniad"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Fformat ID3:"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+msgid "Confirm selected action"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "iawn"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+msgid "No"
+msgstr "Na"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "Cyffredinol"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4367,32 +4253,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4429,72 +4315,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -5770,6 +5661,22 @@
 msgstr "Ynghylch %s"
 
 #, fuzzy
+#~ msgid "Subtune Control"
+#~ msgstr "Rheolwr sain"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ msgstr "Diystyru'r teitlau cyffredinol"
+
+#, fuzzy
+#~ msgid "Song name/title format:"
+#~ msgstr "Fformat y teitl:"
+
+#, fuzzy
+#~ msgid "No sub-tune control."
+#~ msgstr "Rheolwr sain"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Hz"
 
@@ -6286,9 +6193,6 @@
 #~ msgid "CCIT J.17"
 #~ msgstr "CCIT J.17"
 
-#~ msgid "No"
-#~ msgstr "Na"
-
 #~ msgid "MPEG Level:"
 #~ msgstr "Lefel MPEG:"
 
--- a/po/de.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/de.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
-"PO-Revision-Date: 2007-08-30 18:30+0100\n"
+"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"PO-Revision-Date: 2007-09-05 00:24+0100\n"
 "Last-Translator: Michael Färber <0102@gmx.at>\n"
 "Language-Team: german <0102@gmx.at>\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -79,8 +79,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -114,14 +114,14 @@
 msgstr "Kanäle"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -217,43 +217,42 @@
 
 #: src/adplug/adplug-xmms.cc:576
 msgid "Song"
-msgstr ""
+msgstr "Titel"
 
 #: src/adplug/adplug-xmms.cc:602
 msgid "Instrument name"
-msgstr ""
+msgstr "Instrumentenname"
 
 #: src/adplug/adplug-xmms.cc:644
 msgid "Song message"
-msgstr ""
+msgstr "Titel-Meldung"
 
 #: src/adplug/adplug-xmms.cc:666
 msgid "Subsong selection"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:689
+msgstr "Reihenfolge: "
+
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:691
+msgstr "Pattern: "
+
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:692
+msgstr "Row: "
+
+#: src/adplug/adplug-xmms.cc:734
 msgid "Speed: "
 msgstr "Geschwindigkeit: "
 
-#: src/adplug/adplug-xmms.cc:693
-#, fuzzy
+#: src/adplug/adplug-xmms.cc:735
 msgid "Timer: "
-msgstr "Titel:"
-
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+msgstr "Timer: "
+
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -266,6 +265,8 @@
 "Copyright (c) 2006 Audacious team\n"
 "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 msgstr ""
+"Copyright (c) 2006 Audacious team\n"
+"Teile (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
 
 #: src/alarm/interface.c:36
 msgid "About XMMS Alarm"
@@ -288,8 +289,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Schließen"
 
@@ -303,10 +304,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "OK"
 
@@ -337,7 +338,7 @@
 
 #: src/alarm/interface.c:231
 msgid "Oh Well"
-msgstr ""
+msgstr "Jo mei"
 
 #: src/alarm/interface.c:390
 msgid "Alarm Settings"
@@ -354,7 +355,11 @@
 
 #: src/alarm/interface.c:508
 msgid "h"
-msgstr ""
+msgstr "Uhr"
+
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr "Minuten"
 
 #: src/alarm/interface.c:556
 msgid "Quiet after:"
@@ -362,7 +367,7 @@
 
 #: src/alarm/interface.c:566
 msgid "Alarm at (default):"
-msgstr ""
+msgstr "Alarm um (standardmäßig):"
 
 #: src/alarm/interface.c:586
 msgid "Choose the days for the alarm to come on"
@@ -413,12 +418,12 @@
 
 #: src/alarm/interface.c:1052
 msgid "Fading"
-msgstr ""
-
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+msgstr "Übergang"
+
+#: 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
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -429,15 +434,15 @@
 
 #: src/alarm/interface.c:1123
 msgid "Current"
-msgstr ""
+msgstr "Momentan"
 
 #: src/alarm/interface.c:1130
 msgid "reset to current output volume"
-msgstr ""
+msgstr "Zur momentanen Lautstärke zurücksetzen"
 
 #: src/alarm/interface.c:1132
 msgid "Start at"
-msgstr ""
+msgstr "Beginnen bei"
 
 #: src/alarm/interface.c:1160 src/alarm/interface.c:1204
 msgid "%"
@@ -445,15 +450,15 @@
 
 #: src/alarm/interface.c:1176
 msgid "Final"
-msgstr ""
+msgstr "Schluss"
 
 #: src/alarm/interface.c:1229
 msgid "Additional Command"
-msgstr ""
+msgstr "Zusätzlicher Befehl"
 
 #: src/alarm/interface.c:1255
 msgid "enable"
-msgstr ""
+msgstr "aktivieren"
 
 #: src/alarm/interface.c:1263
 msgid "Playlist (optional)"
@@ -465,11 +470,11 @@
 
 #: src/alarm/interface.c:1297 src/alarm/interface.c:1462
 msgid "Reminder"
-msgstr ""
+msgstr "Erinnerung"
 
 #: src/alarm/interface.c:1314
 msgid "Use reminder"
-msgstr ""
+msgstr "Erinnerung benützen"
 
 #: src/alarm/interface.c:1330 src/sndstretch/sndstretch_xmms.c:381
 msgid "Options"
@@ -540,7 +545,7 @@
 
 #: src/alarm/interface.c:1470
 msgid "Your reminder for today is.."
-msgstr ""
+msgstr "Die Erinnerung für heute lautet.."
 
 #: src/alarm/interface.c:1495
 msgid "Thankyou"
@@ -693,9 +698,8 @@
 msgstr "Soundkarte: "
 
 #: src/amidi-plug/i_configure-alsa.c:396
-#, fuzzy
 msgid "Mixer control: "
-msgstr "Lautstärkesteuerung:"
+msgstr "Mixersteuerung: "
 
 #: src/amidi-plug/i_configure-alsa.c:408
 msgid "Mixer settings"
@@ -871,7 +875,7 @@
 
 #: src/amidi-plug/i_configure-dummy.c:181
 msgid "Do not log anything"
-msgstr ""
+msgstr "Nichts mitloggen"
 
 #: src/amidi-plug/i_configure-dummy.c:185
 msgid "Log MIDI events to standard output"
@@ -887,23 +891,23 @@
 
 #: src/amidi-plug/i_configure-dummy.c:202
 msgid "Logfile settings"
-msgstr ""
+msgstr "Logdatei-Einstellungen"
 
 #: src/amidi-plug/i_configure-dummy.c:209
 msgid "Use a single file to log everything (rewrite)"
-msgstr ""
+msgstr "Eine einzige Datei verwenden, um alles zu loggen (neu schreiben)"
 
 #: src/amidi-plug/i_configure-dummy.c:213
 msgid "Use a single file to log everything (append)"
-msgstr ""
+msgstr "Eine einzige Datei verwenden, um alles zu loggen (anhängen)"
 
 #: src/amidi-plug/i_configure-dummy.c:217
 msgid "Use a different logfile for each MIDI file"
-msgstr ""
+msgstr "Verschiedene Logdateien für jede einzelne MIDI-Datei verwenden"
 
 #: src/amidi-plug/i_configure-dummy.c:223
 msgid "» Log dir:"
-msgstr ""
+msgstr "» Logverzeichnis:"
 
 #: src/amidi-plug/i_configure-dummy.c:229
 #: src/amidi-plug/i_configure-dummy.c:241
@@ -912,19 +916,19 @@
 
 #: src/amidi-plug/i_configure-dummy.c:235
 msgid "» Log file:"
-msgstr ""
+msgstr "» Logdatei:"
 
 #: src/amidi-plug/i_configure-dummy.c:267
 msgid "Playback speed"
-msgstr ""
+msgstr "Wiedergabegeschwindigkeit"
 
 #: src/amidi-plug/i_configure-dummy.c:272
 msgid "Play at normal speed"
-msgstr ""
+msgstr "Mit normaler Geschwindigkeit abspielen"
 
 #: src/amidi-plug/i_configure-dummy.c:275
 msgid "Play as fast as possible"
-msgstr ""
+msgstr "So schnell wie möglich abspielen"
 
 #: src/amidi-plug/i_configure-dummy.c:329
 msgid "Dummy Backend not loaded or not available"
@@ -950,7 +954,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:452
 msgid "Size (bytes)"
-msgstr ""
+msgstr "Größe (Byte)"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:501
 msgid "Load SF on player start"
@@ -1186,8 +1190,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Name:"
 
@@ -1213,7 +1217,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:217
 msgid "BPM:"
-msgstr ""
+msgstr "BPM:"
 
 #: src/amidi-plug/i_fileinfo.c:223
 msgid "BPM (wavg):"
@@ -1240,9 +1244,8 @@
 msgstr "  (ungültiges UTF-8)"
 
 #: src/amidi-plug/i_utils.c:43
-#, fuzzy
 msgid "AMIDI-Plug - about"
-msgstr "ESD-Ausgabe-Plugin-Konfiguration"
+msgstr "Über AMIDI-Plug"
 
 #: src/amidi-plug/i_utils.c:68
 msgid ""
@@ -1277,15 +1280,15 @@
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
-msgstr ""
+msgstr "Rechteck"
 
 #: src/aosd/aosd_style.c:79
 msgid "Rounded Rectangle"
-msgstr ""
+msgstr "Abgerundetes Rechteck"
 
 #: src/aosd/aosd_style.c:83
 msgid "Concave Rectangle"
-msgstr ""
+msgstr "Konkaves Rechteck"
 
 #: src/aosd/aosd_style.c:87
 msgid "None"
@@ -1293,15 +1296,15 @@
 
 #: src/aosd/aosd_trigger.c:73
 msgid "Playback Start"
-msgstr ""
+msgstr "Wiedergabebeginn"
 
 #: src/aosd/aosd_trigger.c:74
 msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
+msgstr "Löst OSD beim Abspielen eines Wiedergabelisteneintrags aus"
 
 #: src/aosd/aosd_trigger.c:78
 msgid "Title Change"
-msgstr ""
+msgstr "Titeländerung"
 
 #: src/aosd/aosd_trigger.c:79
 msgid ""
@@ -1312,11 +1315,11 @@
 
 #: src/aosd/aosd_trigger.c:85
 msgid "Volume Change"
-msgstr ""
+msgstr "Lautstärkeänderung"
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Triggers OSD when volume is changed."
-msgstr ""
+msgstr "Löst OSD bei Lautstärkeänderung aus"
 
 #: src/aosd/aosd_trigger.c:90
 msgid "Pause On"
@@ -1324,7 +1327,7 @@
 
 #: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when playback is paused."
-msgstr ""
+msgstr "Löst OSD beim Pausieren der Wiedergabe aus"
 
 #: src/aosd/aosd_trigger.c:95
 msgid "Pause Off"
@@ -1332,7 +1335,7 @@
 
 #: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is unpaused."
-msgstr ""
+msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus"
 
 #: src/aosd/aosd_ui.c:168
 msgid "Placement"
@@ -1360,7 +1363,7 @@
 
 #: src/aosd/aosd_ui.c:239
 msgid "all monitors"
-msgstr "Alle Bildschirme"
+msgstr "Allen Bildschirmen"
 
 #: src/aosd/aosd_ui.c:242
 #, c-format
@@ -1429,10 +1432,10 @@
 msgid "Skin file:"
 msgstr "Skin-Datei:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "Suchen"
 
@@ -1513,7 +1516,7 @@
 msgstr "Auslöser"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 msgid "Misc"
 msgstr "Verschiedenes"
 
@@ -1543,9 +1546,8 @@
 msgstr ""
 
 #: src/arts/arts.c:22
-#, fuzzy
 msgid "About aRts Output"
-msgstr "Über Null-Ausgabe-Plugin"
+msgstr "Über aRts-Ausgabe"
 
 #: src/arts/arts.c:23
 msgid ""
@@ -1554,9 +1556,8 @@
 msgstr ""
 
 #: src/arts/configure.c:50
-#, fuzzy
 msgid "aRts Driver configuration"
-msgstr "OSS-Treiber-Konfiguration"
+msgstr "aRts-Treiber-Konfiguration"
 
 #: 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
@@ -1659,9 +1660,8 @@
 msgstr ""
 
 #: src/audiocompress/audacious-glue.c:537
-#, fuzzy
 msgid "Audio values"
-msgstr "Audiogerät:"
+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
@@ -1786,7 +1786,7 @@
 msgstr "Standard-Liedlänge:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Resampling"
 
@@ -1937,51 +1937,51 @@
 
 #: src/evdev-plug/ed.c:64
 msgid "Playback->Eject"
-msgstr ""
+msgstr "Wiedergabe->Auswerfen"
 
 #: src/evdev-plug/ed.c:66
 msgid "Playlist->Repeat"
-msgstr ""
+msgstr "Wiedergabe->Wiederholen"
 
 #: src/evdev-plug/ed.c:67
 msgid "Playlist->Shuffle"
-msgstr ""
+msgstr "Wiedergabe->Zufällige Wiedergabe"
 
 #: src/evdev-plug/ed.c:69
 msgid "Volume->Up_5"
-msgstr ""
+msgstr "Lautstärke->Um 5 erhöhen"
 
 #: src/evdev-plug/ed.c:70
 msgid "Volume->Down_5"
-msgstr ""
+msgstr "Lautstärke->Um 5 verringern"
 
 #: src/evdev-plug/ed.c:71
 msgid "Volume->Up_10"
-msgstr ""
+msgstr "Lautstärke->Um 10 erhöhen"
 
 #: src/evdev-plug/ed.c:72
 msgid "Volume->Down_10"
-msgstr ""
+msgstr "Lautstärke->Um 10 verringern"
 
 #: src/evdev-plug/ed.c:73
 msgid "Volume->Mute"
-msgstr ""
+msgstr "Lautstärke->Lautlos"
 
 #: src/evdev-plug/ed.c:75
 msgid "Window->Main"
-msgstr ""
+msgstr "Fenster->Hauptfenster"
 
 #: src/evdev-plug/ed.c:76
 msgid "Window->Playlist"
-msgstr ""
+msgstr "Fenster->Wiedergabeliste"
 
 #: src/evdev-plug/ed.c:77
 msgid "Window->Equalizer"
-msgstr ""
+msgstr "Fenster->Equalizer"
 
 #: src/evdev-plug/ed.c:78
 msgid "Window->JumpToFile"
-msgstr ""
+msgstr "Fenster->Zu Titel springen"
 
 #: src/evdev-plug/ed_internals.c:93
 #, c-format
@@ -2087,7 +2087,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Fehler"
@@ -2178,25 +2178,24 @@
 msgstr ""
 
 #: src/evdev-plug/ed_ui.c:1322
-#, fuzzy
 msgid "EvDev-Plug - Bindings Configuration"
-msgstr "ESD-Ausgabe-Plugin-Konfiguration"
+msgstr "EvDev-Plug - Bindungskonfiguration"
 
 #: src/evdev-plug/ed_ui.c:1362
 msgid "<b>Name: </b>"
-msgstr ""
+msgstr "<b>Name: </b>"
 
 #: src/evdev-plug/ed_ui.c:1371
 msgid "<b>Filename: </b>"
-msgstr ""
+msgstr "<b>Dateiname: </b>"
 
 #: src/evdev-plug/ed_ui.c:1380
 msgid "<b>Phys.Address: </b>"
-msgstr ""
+msgstr "<b>Phys. Adresse: </b>"
 
 #: src/evdev-plug/ed_ui.c:1459
 msgid "EvDev-Plug - about"
-msgstr ""
+msgstr "Über EvDev-Plug"
 
 #: src/evdev-plug/ed_ui.c:1490
 msgid ""
@@ -2207,11 +2206,11 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 msgid "About FileWriter-Plugin"
 msgstr "Über FileWriter-Plugin"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2231,57 +2230,57 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:197
+#: 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:512
+#: src/filewriter/filewriter.c:514
 msgid "File Writer Configuration"
 msgstr "FileWriter-Konfiguration"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 msgid "Output file format:"
 msgstr "Ausgabedatei-Format:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr "In Original-Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr "In anderes Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Ausgabedatei-Verzeichnis:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr "Verzeichnis wählen"
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr "Dateiname erhalten von:"
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr "ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr "ürsprünglichen Dateinamen"
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Dateiendung nicht entfernen"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
@@ -2289,7 +2288,7 @@
 "Wenn aktiviert, wird die Erweiterung des ursprünglichen Dateinamens nicht "
 "entfernt, bevor die neue Dateierweiterung am Ende angefügt wird."
 
-#: src/filewriter/filewriter.c:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr "Track-Nummer vor Dateinamen anhängen"
 
@@ -2351,7 +2350,7 @@
 
 #: src/filewriter/mp3.c:942
 msgid "Misc:"
-msgstr ""
+msgstr "Verschiedenes:"
 
 #: src/filewriter/mp3.c:953
 msgid "Enforce strict ISO complience"
@@ -2575,7 +2574,7 @@
 
 #: src/ladspa/ladspa.c:855
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 #: src/ladspa/ladspa.c:930
 msgid "Installed plugins"
@@ -2691,9 +2690,8 @@
 msgstr ""
 
 #: src/madplug/configure.c:213
-#, fuzzy
 msgid "Default gain (dB):"
-msgstr "Standard (%s)"
+msgstr "Standard-Verstärkung (dB):"
 
 #: src/madplug/configure.c:224
 msgid "Preamp (dB):"
@@ -2710,10 +2708,9 @@
 
 #: src/madplug/configure.c:251
 msgid "ID3 format:"
-msgstr ""
-
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+msgstr "ID3-Format:"
+
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Titel"
 
@@ -2778,7 +2775,7 @@
 
 #: src/madplug/fileinfo.c:500
 msgid "Unknown"
-msgstr ""
+msgstr "Unbekannt"
 
 #: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:633 src/tta/libtta.c:431
 #: src/wavpack/ui.cxx:407
@@ -2984,9 +2981,8 @@
 msgstr ""
 
 #: src/modplug/gui/interface.cxx:528
-#, fuzzy
 msgid "Surround"
-msgstr "Surround-Echo"
+msgstr "Surround"
 
 #: src/modplug/gui/interface.cxx:600
 msgid "Preamp"
@@ -3020,7 +3016,7 @@
 
 #: src/modplug/gui/interface.cxx:709
 msgid "Effects"
-msgstr ""
+msgstr "Effekte"
 
 #: src/modplug/gui/interface.cxx:793
 msgid "MOD Info"
@@ -3046,11 +3042,11 @@
 
 #: src/modplug/gui/interface.cxx:899
 msgid "Instruments"
-msgstr ""
+msgstr "Instrumente"
 
 #: src/modplug/gui/interface.cxx:932
 msgid "Message"
-msgstr ""
+msgstr "Meldung"
 
 #: src/modplug/gui/main.cxx:43
 msgid "Modplug Input Plugin for Audacious ver"
@@ -3116,9 +3112,8 @@
 msgstr "Plugin"
 
 #: src/musepack/libmpc.cxx:189
-#, fuzzy
 msgid "ReplayGain Settings"
-msgstr "ReplayGain"
+msgstr "ReplayGain-Einstellungen"
 
 #: src/musepack/libmpc.cxx:196 src/vorbis/configure.c:172
 #: src/wavpack/ui.cxx:508
@@ -3131,9 +3126,8 @@
 msgstr ""
 
 #: src/musepack/libmpc.cxx:206
-#, fuzzy
 msgid "ReplayGain Type"
-msgstr "ReplayGain"
+msgstr "ReplayGain-Typ"
 
 #: src/musepack/libmpc.cxx:214
 msgid "Use Track Gain"
@@ -3143,8 +3137,8 @@
 msgid "Use Album Gain"
 msgstr ""
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "Dateiname:"
 
@@ -3156,8 +3150,8 @@
 msgid "Track:"
 msgstr "Titel:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr ""
 
@@ -3407,154 +3401,134 @@
 msgid "Scrobbler Error"
 msgstr "Scrobbler-Fehler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
 #, fuzzy
-msgid "Subtune Control"
-msgstr "Lautstärkesteuerung:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-msgid "Audacious-SID Configuration"
+msgid "Audacious-SID configuration"
 msgstr "Audacious-SID-Konfiguration"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 msgid "8-bit"
 msgstr "8 Bit"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 msgid "16-bit"
 msgstr "16 Bit"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 msgid "Resolution:"
 msgstr "Auflösung:"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 msgid "Samplerate:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 msgid "Use oversampling"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 msgid "Oversampling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr "Geschwindigkeit erzwingen"
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr "PAL (50 Hz)"
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr "NTSC (60 Hz)"
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
-#, fuzzy
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 msgid "Force model"
-msgstr "Titelnummer:"
-
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+msgstr "Modell erzwingen"
+
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3562,91 +3536,89 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
-#, fuzzy
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 msgid "SID model:"
-msgstr "Abspielmodus:"
-
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+msgstr "SID-Modell:"
+
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+msgstr "Auswahl der Emulations-Bibliothek:"
+
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+msgstr "Echter C64 (nur SIDPlay 2)"
+
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
-#, fuzzy
+msgstr "PlaySID-Umgebung"
+
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 msgid "Memory mode:"
-msgstr "Abspielmodus:"
-
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+msgstr "Speichermodus:"
+
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+msgstr "reSID-Emulation"
+
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -3655,47 +3627,47 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+msgstr "HardSID"
+
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+msgstr "SIDPlay 2-Optionen:"
+
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 msgid "Resampling (FIR)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 msgid "reSID sampling options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -3703,376 +3675,278 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+msgid "Export"
+msgstr "Exportieren"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 msgid "Import"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-msgid "Export"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+msgstr "Importieren"
+
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
 #, fuzzy
+msgid "Delete"
+msgstr "Standard"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 msgid "Filter curve:"
-msgstr "Dateigrösse:"
-
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+msgstr "Filterkurve:"
+
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+msgstr "SIDPlay2"
+
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+msgstr "Filter"
+
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
-#, fuzzy
+#: 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
 msgid "Playtime:"
-msgstr "Abspielmodus:"
-
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+msgstr "Spielzeit:"
+
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+msgstr "Minimale Spielzeit:"
+
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+msgstr "Maximale Spielzeit:"
+
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
-#, fuzzy
+msgstr "XSIDPLAY-kompatible Datenbank benützen"
+
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 msgid "DB-file:"
-msgstr "Gerät:"
-
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+msgstr "DB-Datei:"
+
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+msgstr "Datenbankpfad und -dateiname"
+
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Lautstärkesteuerung:"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
-#, fuzzy
+msgstr "STIL-Datenbank verwenden"
+
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 msgid "STIL file:"
-msgstr "Titel:"
-
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+msgstr "STIL-Datei:"
+
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-msgid "Override generic XMMS titles"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-msgid "Song name/title format:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Lautstärkesteuerung:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Lautstärkesteuerung:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
-#, fuzzy
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 msgid "Audacious-SID Fileinfo"
-msgstr "%s - Audacious"
-
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+msgstr "Audacious-SID-Dateiinformation"
+
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+msgstr "Titel:"
+
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+msgstr "Komponist:"
+
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
-#, fuzzy
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 msgid "Song Information:"
-msgstr "Ort:"
-
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+msgstr "Titel-Information:"
+
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+msgstr "Autor:"
+
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 msgid "Duration:"
 msgstr "Länge:"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Ort:"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+msgstr "HVSC-Titellängendatenbank auswählen"
+
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#, fuzzy
+msgid "Select STIL-database"
+msgstr "STIL-Datenbank auswählen"
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "Format-Auswahl"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "Ja"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "Kein"
+
+#: src/sid/xs_fileinfo.c:238
 msgid "General info"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4095,32 +3969,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4157,72 +4031,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -4244,9 +4123,8 @@
 msgstr ""
 
 #: src/sndstretch/sndstretch_xmms.c:379
-#, fuzzy
 msgid "Pitch"
-msgstr "Pfad:"
+msgstr "Tonhöhe"
 
 #: src/sndstretch/sndstretch_xmms.c:380
 msgid "Scale"
@@ -4258,7 +4136,7 @@
 
 #: src/song_change/song_change.c:349
 msgid "Commands"
-msgstr ""
+msgstr "Befehle"
 
 #: src/song_change/song_change.c:356
 msgid "Command to run when Audacious starts a new song."
@@ -4315,7 +4193,7 @@
 
 #: src/statusicon/gtktrayicon-x11.c:134
 msgid "The orientation of the tray"
-msgstr ""
+msgstr "Die Ausrichtung des Trays"
 
 #: src/statusicon/si_ui.c:571
 msgid "About Status Icon Plugin"
@@ -4329,6 +4207,11 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
 msgstr ""
+"\n"
+"geschrieben von Giacomo Lozito < james@develia.org >\n"
+"\n"
+"Dieses Plugin stellt ein Status-Icon bereit, im\n"
+"System-Tray des Fenstermanagers.\n"
 
 #: src/statusicon/si_ui.c:645
 msgid "Status Icon Plugin - Preferences"
@@ -4336,31 +4219,31 @@
 
 #: src/statusicon/si_ui.c:656
 msgid "Right-Click Menu"
-msgstr ""
+msgstr "Rechtsklick-Menü"
 
 #: src/statusicon/si_ui.c:661
 msgid "Audacious standard menu"
-msgstr ""
+msgstr "Audacious-Standard-Menü"
 
 #: src/statusicon/si_ui.c:666
 msgid "Small playback menu #1"
-msgstr ""
+msgstr "Kleines Wiedergabe-Menü #1"
 
 #: src/statusicon/si_ui.c:671
 msgid "Small playback menu #2"
-msgstr ""
+msgstr "Kleines Wiedergabe-Menü #2"
 
 #: src/statusicon/si_ui.c:694
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Maus-Scroll-Aktion"
 
 #: src/statusicon/si_ui.c:699
 msgid "Change volume"
-msgstr ""
+msgstr "Lautstärke ändern"
 
 #: src/statusicon/si_ui.c:704
 msgid "Change playing song"
-msgstr ""
+msgstr "Aktiven Titel ändern"
 
 #: src/stereo_plugin/stereo.c:29
 msgid ""
@@ -4368,14 +4251,17 @@
 "\n"
 "By Johan Levin 1999."
 msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"Von Johan Levin 1999."
 
 #: src/stereo_plugin/stereo.c:55
 msgid "About Extra Stereo Plugin"
-msgstr ""
+msgstr "Über das Extra Stereo Plugin"
 
 #: src/stereo_plugin/stereo.c:96
 msgid "Configure Extra Stereo"
-msgstr ""
+msgstr "Extra Stereo konfigurieren"
 
 #: src/stereo_plugin/stereo.c:98
 msgid "Effect intensity:"
@@ -4383,7 +4269,7 @@
 
 #: src/sun/about.c:34
 msgid "About the Sun Driver"
-msgstr ""
+msgstr "Über den Sun-Treiber"
 
 #: src/sun/about.c:35
 msgid ""
@@ -4392,22 +4278,26 @@
 "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
 "Maintainer: <vedge at csoft.org>.\n"
 msgstr ""
+"XMMS BSD Sun Driver\n"
+"\n"
+"Copyright (c) 2001 CubeSoft Communications, Inc.\n"
+"Betreuer: <vedge at csoft.org>.\n"
 
 #: src/sun/configure.c:201
 msgid "Audio control device:"
-msgstr ""
+msgstr "Audio-Kontroll-Gerät:"
 
 #: src/sun/configure.c:350
 msgid "Volume controls device:"
-msgstr ""
+msgstr "Lautstärke-Kontroll-Gerät:"
 
 #: src/sun/configure.c:363
 msgid "XMMS uses mixer exclusively."
-msgstr ""
+msgstr "XMMS benützt den Mixer exklusiv."
 
 #: src/sun/configure.c:538
 msgid "Sun driver configuration"
-msgstr ""
+msgstr "Sun-Treiber-Konfiguration"
 
 #: src/timidity/src/interface.c:56
 msgid "TiMidity Configuration"
@@ -4461,11 +4351,17 @@
 "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 ""
+"Sinuston-Generator von Haavard Kvaalen <havardk@xmms.org>\n"
+"Verändert von Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"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
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
 #: src/tonegen/tonegen.c:170
 msgid "Tone Generator: "
@@ -4473,23 +4369,23 @@
 
 #: src/tta/libtta.c:148
 msgid "Can't open file\n"
-msgstr ""
+msgstr "Kann Datei nicht öffnen\n"
 
 #: src/tta/libtta.c:151
 msgid "Not supported file format\n"
-msgstr ""
+msgstr "Kein unterstütztes Dateiformat\n"
 
 #: src/tta/libtta.c:154
 msgid "File is corrupted\n"
-msgstr ""
+msgstr "Datei ist beschädigt\n"
 
 #: src/tta/libtta.c:157
 msgid "Can't read from file\n"
-msgstr ""
+msgstr "Kann nicht von Datei lesen\n"
 
 #: src/tta/libtta.c:160
 msgid "Insufficient memory available\n"
-msgstr ""
+msgstr "Zu wenig Speicher verfügbar\n"
 
 #: src/tta/libtta.c:163
 msgid "Output plugin error\n"
@@ -4497,11 +4393,11 @@
 
 #: src/tta/libtta.c:166
 msgid "Unknown error\n"
-msgstr ""
+msgstr "Unbekannter Fehler\n"
 
 #: src/tta/libtta.c:170
 msgid "TTA Decoder Error"
-msgstr ""
+msgstr "TTA-Dekoder-Fehler"
 
 #: src/tta/libtta.c:279
 msgid "TTA input plugin "
@@ -4512,6 +4408,8 @@
 " for BMP\n"
 "Copyright (c) 2004 True Audio Software\n"
 msgstr ""
+" für BMP\n"
+"Copyright (c) 2004 True Audio Software\n"
 
 #: src/tta/libtta.c:283
 msgid "About True Audio Plugin"
@@ -4523,23 +4421,23 @@
 
 #: src/vorbis/configure.c:117
 msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr ""
+msgstr "Ogg-Vorbis-Audio-Plugin-Konfiguration"
 
 #: src/vorbis/configure.c:129
 msgid "Ogg Vorbis Tags:"
-msgstr ""
+msgstr "Ogg-Vorbis-Tags:"
 
 #: src/vorbis/configure.c:150
 msgid "Title format:"
-msgstr ""
+msgstr "Titelformat:"
 
 #: src/vorbis/configure.c:164 src/wavpack/ui.cxx:500
 msgid "ReplayGain Settings:"
-msgstr ""
+msgstr "ReplayGain-Einstellungen:"
 
 #: src/vorbis/configure.c:182 src/wavpack/ui.cxx:518
 msgid "ReplayGain Type:"
-msgstr ""
+msgstr "ReplayGain-Typ:"
 
 #: src/vorbis/configure.c:193 src/wavpack/ui.cxx:529
 msgid "use Track Gain/Peak"
@@ -4599,7 +4497,7 @@
 
 #: src/vorbis/fileinfo.c:85
 msgid "Oldies"
-msgstr ""
+msgstr "Oldies"
 
 #: src/vorbis/fileinfo.c:86
 msgid "Other"
@@ -4611,7 +4509,7 @@
 
 #: src/vorbis/fileinfo.c:86
 msgid "R&B"
-msgstr ""
+msgstr "R&B"
 
 #: src/vorbis/fileinfo.c:86
 msgid "Rap"
@@ -4639,7 +4537,7 @@
 
 #: src/vorbis/fileinfo.c:88
 msgid "Ska"
-msgstr ""
+msgstr "Ska"
 
 #: src/vorbis/fileinfo.c:88
 msgid "Death Metal"
@@ -4647,7 +4545,7 @@
 
 #: src/vorbis/fileinfo.c:88
 msgid "Pranks"
-msgstr ""
+msgstr "Pranks"
 
 #: src/vorbis/fileinfo.c:88
 msgid "Soundtrack"
@@ -4667,7 +4565,7 @@
 
 #: src/vorbis/fileinfo.c:89
 msgid "Vocal"
-msgstr ""
+msgstr "Vocal"
 
 #: src/vorbis/fileinfo.c:90
 msgid "Jazz+Funk"
@@ -4675,7 +4573,7 @@
 
 #: src/vorbis/fileinfo.c:90
 msgid "Fusion"
-msgstr ""
+msgstr "Fusion"
 
 #: src/vorbis/fileinfo.c:90
 msgid "Trance"
@@ -4687,7 +4585,7 @@
 
 #: src/vorbis/fileinfo.c:91
 msgid "Instrumental"
-msgstr ""
+msgstr "Instrumental"
 
 #: src/vorbis/fileinfo.c:91
 msgid "Acid"
@@ -4711,15 +4609,15 @@
 
 #: src/vorbis/fileinfo.c:92
 msgid "Noise"
-msgstr ""
+msgstr "Noise"
 
 #: src/vorbis/fileinfo.c:92
 msgid "AlternRock"
-msgstr ""
+msgstr "AlternRock"
 
 #: src/vorbis/fileinfo.c:93
 msgid "Bass"
-msgstr ""
+msgstr "Bass"
 
 #: src/vorbis/fileinfo.c:93
 msgid "Soul"
@@ -4739,11 +4637,11 @@
 
 #: src/vorbis/fileinfo.c:94
 msgid "Instrumental Pop"
-msgstr ""
+msgstr "Instrumental Pop"
 
 #: src/vorbis/fileinfo.c:95
 msgid "Instrumental Rock"
-msgstr ""
+msgstr "Instrumental Rock"
 
 #: src/vorbis/fileinfo.c:95
 msgid "Ethnic"
@@ -4779,171 +4677,171 @@
 
 #: src/vorbis/fileinfo.c:98
 msgid "Southern Rock"
-msgstr ""
+msgstr "Southern Rock"
 
 #: src/vorbis/fileinfo.c:98
 msgid "Comedy"
-msgstr ""
+msgstr "Komödie"
 
 #: src/vorbis/fileinfo.c:98
 msgid "Cult"
-msgstr ""
+msgstr "Cult"
 
 #: src/vorbis/fileinfo.c:99
 msgid "Gangsta Rap"
-msgstr ""
+msgstr "Gangsta Rap"
 
 #: src/vorbis/fileinfo.c:99
 msgid "Top 40"
-msgstr ""
+msgstr "Top 40"
 
 #: src/vorbis/fileinfo.c:99
 msgid "Christian Rap"
-msgstr ""
+msgstr "Christian Rap"
 
 #: src/vorbis/fileinfo.c:100
 msgid "Pop/Funk"
-msgstr ""
+msgstr "Pop/Funk"
 
 #: src/vorbis/fileinfo.c:100
 msgid "Jungle"
-msgstr ""
+msgstr "Jungle"
 
 #: src/vorbis/fileinfo.c:100
 msgid "Native American"
-msgstr ""
+msgstr "Native American"
 
 #: src/vorbis/fileinfo.c:101
 msgid "Cabaret"
-msgstr ""
+msgstr "Kabarett"
 
 #: src/vorbis/fileinfo.c:101
 msgid "New Wave"
-msgstr ""
+msgstr "New Wave"
 
 #: src/vorbis/fileinfo.c:101
 msgid "Psychedelic"
-msgstr ""
+msgstr "Psychedelic"
 
 #: src/vorbis/fileinfo.c:101
 msgid "Rave"
-msgstr ""
+msgstr "Rave"
 
 #: src/vorbis/fileinfo.c:102
 msgid "Showtunes"
-msgstr ""
+msgstr "Showtunes"
 
 #: src/vorbis/fileinfo.c:102
 msgid "Trailer"
-msgstr ""
+msgstr "Trailer"
 
 #: src/vorbis/fileinfo.c:102
 msgid "Lo-Fi"
-msgstr ""
+msgstr "Lo-Fi"
 
 #: src/vorbis/fileinfo.c:102
 msgid "Tribal"
-msgstr ""
+msgstr "Tribal"
 
 #: src/vorbis/fileinfo.c:103
 msgid "Acid Punk"
-msgstr ""
+msgstr "Acid Punk"
 
 #: src/vorbis/fileinfo.c:103
 msgid "Acid Jazz"
-msgstr ""
+msgstr "Acid Jazz"
 
 #: src/vorbis/fileinfo.c:103
 msgid "Polka"
-msgstr ""
+msgstr "Polka"
 
 #: src/vorbis/fileinfo.c:103
 msgid "Retro"
-msgstr ""
+msgstr "Retro"
 
 #: src/vorbis/fileinfo.c:104
 msgid "Musical"
-msgstr ""
+msgstr "Musical"
 
 #: src/vorbis/fileinfo.c:104
 msgid "Rock & Roll"
-msgstr ""
+msgstr "Rock & Roll"
 
 #: src/vorbis/fileinfo.c:104
 msgid "Hard Rock"
-msgstr ""
+msgstr "Hard Rock"
 
 #: src/vorbis/fileinfo.c:104
 msgid "Folk"
-msgstr ""
+msgstr "Folk"
 
 #: src/vorbis/fileinfo.c:105
 msgid "Folk/Rock"
-msgstr ""
+msgstr "Folk/Rock"
 
 #: src/vorbis/fileinfo.c:105
 msgid "National Folk"
-msgstr ""
+msgstr "National Folk"
 
 #: src/vorbis/fileinfo.c:105
 msgid "Swing"
-msgstr ""
+msgstr "Swing"
 
 #: src/vorbis/fileinfo.c:106
 msgid "Fast-Fusion"
-msgstr ""
+msgstr "Fast-Fusion"
 
 #: src/vorbis/fileinfo.c:106
 msgid "Bebob"
-msgstr ""
+msgstr "Bebob"
 
 #: src/vorbis/fileinfo.c:106
 msgid "Latin"
-msgstr ""
+msgstr "Latin"
 
 #: src/vorbis/fileinfo.c:106
 msgid "Revival"
-msgstr ""
+msgstr "Revival"
 
 #: src/vorbis/fileinfo.c:107
 msgid "Celtic"
-msgstr ""
+msgstr "Keltisch"
 
 #: src/vorbis/fileinfo.c:107
 msgid "Bluegrass"
-msgstr ""
+msgstr "Bluegrass"
 
 #: src/vorbis/fileinfo.c:107
 msgid "Avantgarde"
-msgstr ""
+msgstr "Avantgarde"
 
 #: src/vorbis/fileinfo.c:108
 msgid "Gothic Rock"
-msgstr ""
+msgstr "Gothic Rock"
 
 #: src/vorbis/fileinfo.c:108
 msgid "Progressive Rock"
-msgstr ""
+msgstr "Progressive Rock"
 
 #: src/vorbis/fileinfo.c:109
 msgid "Psychedelic Rock"
-msgstr ""
+msgstr "Psychedelic Rock"
 
 #: src/vorbis/fileinfo.c:109
 msgid "Symphonic Rock"
-msgstr ""
+msgstr "Symphonic Rock"
 
 #: src/vorbis/fileinfo.c:109
 msgid "Slow Rock"
-msgstr ""
+msgstr "Slow Rock"
 
 #: src/vorbis/fileinfo.c:110
 msgid "Big Band"
-msgstr ""
+msgstr "Big Band"
 
 #: src/vorbis/fileinfo.c:110
 msgid "Chorus"
-msgstr ""
+msgstr "Chor"
 
 #: src/vorbis/fileinfo.c:110
 msgid "Easy Listening"
@@ -4951,15 +4849,15 @@
 
 #: src/vorbis/fileinfo.c:111
 msgid "Acoustic"
-msgstr ""
+msgstr "Acoustic"
 
 #: src/vorbis/fileinfo.c:111
 msgid "Humour"
-msgstr ""
+msgstr "Humor"
 
 #: src/vorbis/fileinfo.c:111
 msgid "Speech"
-msgstr ""
+msgstr "Rede"
 
 #: src/vorbis/fileinfo.c:111
 msgid "Chanson"
@@ -4975,31 +4873,31 @@
 
 #: src/vorbis/fileinfo.c:112
 msgid "Sonata"
-msgstr ""
+msgstr "Sonate"
 
 #: src/vorbis/fileinfo.c:112
 msgid "Symphony"
-msgstr ""
+msgstr "Symphonie"
 
 #: src/vorbis/fileinfo.c:113
 msgid "Booty Bass"
-msgstr ""
+msgstr "Booty Bass"
 
 #: src/vorbis/fileinfo.c:113
 msgid "Primus"
-msgstr ""
+msgstr "Primus"
 
 #: src/vorbis/fileinfo.c:113
 msgid "Porn Groove"
-msgstr ""
+msgstr "Porn Groove"
 
 #: src/vorbis/fileinfo.c:114
 msgid "Satire"
-msgstr ""
+msgstr "Satire"
 
 #: src/vorbis/fileinfo.c:114
 msgid "Slow Jam"
-msgstr ""
+msgstr "Slow Jam"
 
 #: src/vorbis/fileinfo.c:114
 msgid "Club"
@@ -5015,115 +4913,115 @@
 
 #: src/vorbis/fileinfo.c:115
 msgid "Folklore"
-msgstr ""
+msgstr "Folklore"
 
 #: src/vorbis/fileinfo.c:115
 msgid "Ballad"
-msgstr ""
+msgstr "Ballad"
 
 #: src/vorbis/fileinfo.c:115
 msgid "Power Ballad"
-msgstr ""
+msgstr "Power Ballad"
 
 #: src/vorbis/fileinfo.c:116
 msgid "Rhythmic Soul"
-msgstr ""
+msgstr "Rhythmic Soul"
 
 #: src/vorbis/fileinfo.c:116
 msgid "Freestyle"
-msgstr ""
+msgstr "Freestyle"
 
 #: src/vorbis/fileinfo.c:116
 msgid "Duet"
-msgstr ""
+msgstr "Duett"
 
 #: src/vorbis/fileinfo.c:117
 msgid "Punk Rock"
-msgstr ""
+msgstr "Punk Rock"
 
 #: src/vorbis/fileinfo.c:117
 msgid "Drum Solo"
-msgstr ""
+msgstr "Schlagzeug-Solo"
 
 #: src/vorbis/fileinfo.c:117
 msgid "A Cappella"
-msgstr ""
+msgstr "A Cappella"
 
 #: src/vorbis/fileinfo.c:118
 msgid "Euro-House"
-msgstr ""
+msgstr "Euro-House"
 
 #: src/vorbis/fileinfo.c:118
 msgid "Dance Hall"
-msgstr ""
+msgstr "Dance Hall"
 
 #: src/vorbis/fileinfo.c:118
 msgid "Goa"
-msgstr ""
+msgstr "Goa"
 
 #: src/vorbis/fileinfo.c:119
 msgid "Drum & Bass"
-msgstr ""
+msgstr "Schlagzeug & Bass"
 
 #: src/vorbis/fileinfo.c:119
 msgid "Club-House"
-msgstr ""
+msgstr "Club-House"
 
 #: src/vorbis/fileinfo.c:119
 msgid "Hardcore"
-msgstr ""
+msgstr "Hardcore"
 
 #: src/vorbis/fileinfo.c:120
 msgid "Terror"
-msgstr ""
+msgstr "Terror"
 
 #: src/vorbis/fileinfo.c:120
 msgid "Indie"
-msgstr ""
+msgstr "Indie"
 
 #: src/vorbis/fileinfo.c:120
 msgid "BritPop"
-msgstr ""
+msgstr "BritPop"
 
 #: src/vorbis/fileinfo.c:120
 msgid "Negerpunk"
-msgstr ""
+msgstr "Negerpunk"
 
 #: src/vorbis/fileinfo.c:121
 msgid "Polsk Punk"
-msgstr ""
+msgstr "Polsk Punk"
 
 #: src/vorbis/fileinfo.c:121
 msgid "Beat"
-msgstr ""
+msgstr "Beat"
 
 #: src/vorbis/fileinfo.c:121
 msgid "Christian Gangsta Rap"
-msgstr ""
+msgstr "Christian Gangsta Rap"
 
 #: src/vorbis/fileinfo.c:122
 msgid "Heavy Metal"
-msgstr ""
+msgstr "Heavy Metal"
 
 #: src/vorbis/fileinfo.c:122
 msgid "Black Metal"
-msgstr ""
+msgstr "Black Metal"
 
 #: src/vorbis/fileinfo.c:122
 msgid "Crossover"
-msgstr ""
+msgstr "Crossover"
 
 #: src/vorbis/fileinfo.c:123
 msgid "Contemporary Christian"
-msgstr ""
+msgstr "Contemporary Christian"
 
 #: src/vorbis/fileinfo.c:123
 msgid "Christian Rock"
-msgstr ""
+msgstr "Christian Rock"
 
 #: src/vorbis/fileinfo.c:124
 msgid "Merengue"
-msgstr ""
+msgstr "Merengue"
 
 #: src/vorbis/fileinfo.c:124
 msgid "Salsa"
@@ -5139,11 +5037,11 @@
 
 #: src/vorbis/fileinfo.c:125
 msgid "JPop"
-msgstr ""
+msgstr "JPop"
 
 #: src/vorbis/fileinfo.c:125
 msgid "Synthpop"
-msgstr ""
+msgstr "Synthpop"
 
 #: src/vorbis/fileinfo.c:210
 #, c-format
@@ -5247,7 +5145,7 @@
 #: src/vorbis/fileinfo.c:961
 #, c-format
 msgid "%d KBit/s (nominal)"
-msgstr ""
+msgstr "%d KBit/s (nominell)"
 
 #: src/vorbis/fileinfo.c:963
 #, c-format
@@ -5293,7 +5191,7 @@
 
 #: src/vtx/about.c:22
 msgid "About Vortex Player"
-msgstr ""
+msgstr "Über den Vortex-Player"
 
 #: src/vtx/about.c:24
 msgid ""
@@ -5322,7 +5220,7 @@
 
 #: src/wavpack/ui.cxx:163
 msgid "Ape2 Tag"
-msgstr ""
+msgstr "Ape2-Tag"
 
 #: src/wavpack/ui.cxx:286
 msgid "Wavpack Info:"
@@ -5364,24 +5262,20 @@
 msgstr "Dateigrösse: %d Byte"
 
 #: src/wavpack/ui.cxx:392
-#, fuzzy
 msgid "Title Peak: ?"
-msgstr "Titel:"
+msgstr "Titel-Höchstwert: ?"
 
 #: src/wavpack/ui.cxx:393
-#, fuzzy
 msgid "Album Peak: ?"
-msgstr "Album:"
+msgstr "Album-Höchstwert: ?"
 
 #: src/wavpack/ui.cxx:394
-#, fuzzy
 msgid "Title Gain: ?"
-msgstr "Titel:"
+msgstr "Titel-Verstärkung: ?"
 
 #: src/wavpack/ui.cxx:395
-#, fuzzy
 msgid "Album Gain: ?"
-msgstr "Album:"
+msgstr "Album-Verstärkung: ?"
 
 #: src/wavpack/ui.cxx:469
 msgid "Wavpack Configuration"
@@ -5428,6 +5322,17 @@
 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"
 
--- a/po/ja.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/ja.po	Fri Sep 07 04:04:03 2007 -0500
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins HEAD\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
-"POT-Creation-Date: 2007-08-30 18:23+0200\n"
-"PO-Revision-Date: 2007-08-31 17:04+0900\n"
+"POT-Creation-Date: 2007-09-05 00:28+0200\n"
+"PO-Revision-Date: 2007-09-04 20:38+0900\n"
 "Last-Translator: dai <d+po@vdr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -98,8 +98,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -133,14 +133,14 @@
 msgstr "チャンネル数"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
 #: src/timidity/src/interface.c:167
 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:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "ステレオ"
 
@@ -252,28 +252,28 @@
 msgid "Subsong selection"
 msgstr "サブソング選択"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr "順序: "
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr "パターン: "
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr "列: "
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 msgid "Speed: "
 msgstr "早さ: "
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 msgid "Timer: "
 msgstr "タイマー: "
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -318,8 +318,8 @@
 "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:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "閉じる"
 
@@ -333,10 +333,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "OK"
 
@@ -394,6 +394,10 @@
 msgid "h"
 msgstr "時"
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr "分"
+
 #: src/alarm/interface.c:556
 msgid "Quiet after:"
 msgstr "静かになるまで:"
@@ -453,10 +457,10 @@
 msgid "Fading"
 msgstr "フェーディング"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 msgid "seconds"
 msgstr "秒"
 
@@ -1428,8 +1432,8 @@
 "<span size=\"smaller\">TiMidity\n"
 "バックエンド</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "名前:"
 
@@ -1696,10 +1700,10 @@
 msgid "Skin file:"
 msgstr "スキンファイル:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "参照"
 
@@ -1783,7 +1787,7 @@
 msgstr "トリガー"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 msgid "Misc"
 msgstr "その他"
 
@@ -2084,7 +2088,7 @@
 msgstr "デフォルトの曲の長さ:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "リサンプリング"
 
@@ -2442,7 +2446,7 @@
 "デバイスが検出されていないため, バインディングウィンドウが開けません.\n"
 "デバイスが正しく接続されていることを確認してください."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "エラー"
@@ -2583,11 +2587,11 @@
 "Giacomo Lozito によって書かれた.\n"
 "\n"
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 msgid "About FileWriter-Plugin"
 msgstr "ファイルライタ・プラグインについて"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2623,7 +2627,7 @@
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
 "USA. まで請求して下さい."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 msgid ""
 "You cannot use the FileWriter plugin\n"
 "when you're running in realtime mode."
@@ -2631,51 +2635,51 @@
 "リアルタイムモードで実行しているとき\n"
 "ファイルライタ プラグインは利用できません."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 msgid "File Writer Configuration"
 msgstr "ファイルライタの設定"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 msgid "Output file format:"
 msgstr "出力ファイルフォーマット:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 msgid "Configure"
 msgstr "設定"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr "元のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr "指定のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "ファイル出力先ディレクトリ:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr "ディレクトリの選択"
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr "ファイル名の取得元:"
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr "元のファイルのタグ"
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "ファイル名から拡張子を取り除かない"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 msgid ""
 "If enabled, the extension from the original filename will not be stripped "
 "before adding the new file extension to the end."
@@ -2683,7 +2687,7 @@
 "これを有効にすると, 新しいファイル拡張子を末尾につけるより先に, 元のファイル"
 "名の拡張子は取り除かれません."
 
-#: src/filewriter/filewriter.c:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr "ファイル名の先頭にトラック番号を付加する"
 
@@ -3136,8 +3140,7 @@
 msgid "ID3 format:"
 msgstr "ID3 の書式:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "タイトル"
 
@@ -3606,8 +3609,8 @@
 msgid "Use Album Gain"
 msgstr "アルバムゲインを使用する"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "ファイル名:"
 
@@ -3619,8 +3622,8 @@
 msgid "Track:"
 msgstr "トラック:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "保存"
 
@@ -3930,105 +3933,87 @@
 msgid "Scrobbler Error"
 msgstr "Scrobbler エラー"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr "曲の長さデータベース初期化エラー!\n"
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr "STIL データベース初期化エラー!\n"
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr "オーディオデータバッファのメモリを割り当てられませんでした!\n"
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr "オーバーサンプリングバッファのメモリを割り当てられませんでした!\n"
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr "SID-tune '%s' (サブチューン #%i)を初期化できませんでした!\n"
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, 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:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr "オーバーサンプリングレート変換パスに失敗しました.\n"
 
-#: src/sid/xmms-sid.c:770
-msgid "Subtune Control"
-msgstr "サブチューンコントロール:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr "t_xs_tuneinfo ('%s') のメモリを割り当てられませんでした\n"
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr "sidFilename ('%s') を割り当てられませんでした\n"
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr "t_xs_subtuneinfo ('%s', %i) のメモリを割り当てられませんでした\n"
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Audacious-SID 設定"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 msgid "8-bit"
 msgstr " 8ビット"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 msgid "16-bit"
 msgstr "16ビット"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 msgid "Resolution:"
 msgstr "解像度:"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr "オートパニング"
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "チャンネル数:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 msgid "Samplerate:"
 msgstr "サンプリングレート:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 msgid "Use oversampling"
 msgstr "オーバーサンプリングを使う"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr "ファクター:"
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr "大きなファクターはより CPU パワーを必要とします"
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 msgid "Oversampling:"
 msgstr "オーバーサンプリング:"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr "オーディオ"
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 msgid ""
 "If enabled, this option \"forces\" the emulation engine to use the selected "
 "clock speed/frequency. Otherwise the speed is determined from played file "
@@ -4038,11 +4023,11 @@
 "うことを\"強制\"します. そうでなければ, 速度は演奏するファイル自体から決定さ"
 "れます."
 
-#: src/sid/xmms-sid.glade:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr "速度を強制する"
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 msgid ""
 "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
 "Most of SID-tunes have been made for PAL computers."
@@ -4050,11 +4035,11 @@
 "PAL は 50Hz のリフレッシュレートを用いるヨーロッパの TV 規格です. ほとんどの "
 "SID-tunes は PAL コンピュータ向けに作られています."
 
-#: src/sid/xmms-sid.glade:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr "PAL (50 Hz)"
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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 "
@@ -4063,15 +4048,15 @@
 "NTSC は 60Hz のリフレッシュレートを用い, PAL とは他にも異なる特徴を持つ TV 規"
 "格です. 主にアメリカ, 日本や他の国々で用いられています."
 
-#: src/sid/xmms-sid.glade:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr "NTSC (60 Hz)"
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 msgid "Clock speed:"
 msgstr "クロック速度:"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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 "
@@ -4081,11 +4066,11 @@
 "\"強制\"します. 無効ならば, ファイルが PSIDv2NG タイプなら, 望ましい SID モデ"
 "ルが決定されますが, 利用できなければこの設定が用いられます."
 
-#: src/sid/xmms-sid.glade:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 msgid "Force model"
 msgstr "モデルを強制する"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -4097,19 +4082,19 @@
 "の SID チップは同じではありません), デジタルサンプルの再生を有効にする \"音量"
 "調整バグ\" があります."
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr "MOS 6581"
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr "MOS 8580"
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 msgid "SID model:"
 msgstr "SID モデル:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
@@ -4117,11 +4102,11 @@
 "高速ですがそれほど正確ではない libSIDPlay 1.x を用います. ですがほとんどの場"
 "合問題ありません."
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr "SIDPlay 1 (フレームベース)"
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
@@ -4129,39 +4114,39 @@
 "より正確なエミュレーションのために強力な CPU を必要とする libSIDPlay 2.x を用"
 "います."
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr "SIDPlay 2 (サイクルベース)"
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr "エミュレーションライブラリの選択"
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr "Real C64 (SIDPlay 2 専用)"
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr "バンクスイッチング"
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr "透過 ROM"
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr "PlaySID 環境"
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 msgid "Memory mode:"
 msgstr "メモリモード:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr "Emu#1"
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 msgid ""
 "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
 "which in downgrades the emulation from cycle-exact to something similar to "
@@ -4171,11 +4156,11 @@
 "クル正確からフレーム正確に似た何かに格下げします. この結果, CPU 使用率は下が"
 "りますが, 正確さは悪くなります."
 
-#: src/sid/xmms-sid.glade:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr "最適化モード (高速, 不正確)"
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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 "
@@ -4185,11 +4170,11 @@
 "トウェア SID チップシミュレータです. ソフトウェアのみでのエミュレーションで"
 "は, 本物の利用可能な SID におそらく最も近いものです."
 
-#: src/sid/xmms-sid.glade:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr "reSID エミュレーション"
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -4203,49 +4188,49 @@
 "似点を \"ほぼ 100%\" 達成するために用いられます. より多くの情報は http://www."
 "hardsid.com/ を参照してください."
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr "HardSID"
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr "SIDPlay 2 オプション:"
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 "単純に最近傍のサンプルを用いるだけの, 最速ですが最悪のサンプリング方法です."
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr "高速 (最近傍)"
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 "高い音質を低いサンプリングノイズで生成する, サンプル間の線形補間を用います."
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr "線形補間"
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 msgid "Resampling (FIR)"
 msgstr "リサンプリング (FIR)"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 msgid "reSID sampling options:"
 msgstr "reSID サンプリングオプション:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr "Emu#2"
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4257,71 +4242,60 @@
 "ます. しかし, フィルタエミュレーションが無効だと, フィルタを使っている音色は"
 "まったく本物のようには聞こえません."
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr "フィルタをエミュレートする"
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr "FS"
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr "FM"
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr "FT"
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr "値をリセット"
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr "SIDPlay1"
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr "6581 (reSID)"
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr "8580 (reSID)"
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr "6581R1 (alankila)"
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr "6581R4 (alankila)"
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr "読み込み"
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+msgid "Export"
+msgstr "エクスポート"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 msgid "Import"
 msgstr "インポート"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-msgid "Export"
-msgstr "エクスポート"
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "デフォルト"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 msgid "Filter curve:"
 msgstr "フィルタ曲線:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr "SIDPlay2"
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr "フィルタ"
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 msgid ""
 "If enabled, the tune is played at least for the specified time, adding "
 "silence to the end if necessary."
@@ -4329,21 +4303,21 @@
 "有効ならば, 必要に応じて末尾に無音部分を追加し, 音色は少なくとも指定された時"
 "間で演奏されます."
 
-#: src/sid/xmms-sid.glade:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr "少なくとも指定された時間で演奏"
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 msgid "Playtime:"
 msgstr "演奏時間:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr "最小演奏時間:"
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
@@ -4351,26 +4325,26 @@
 "有効ならば, 音色は指定された持続時間 (最大演奏時間) に到達するまで演奏されま"
 "す."
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr "指定された時間いっぱいまで演奏"
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 "有効ならば, 曲や音色の長さが不明な場合のみ, 最大演奏時間が用いられます."
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr "曲の長さが不明な場合のみ"
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr "最大演奏時間:"
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 msgid ""
 "This option enables using of XSIDPLAY compatible song length database. "
 "(Refer to Audacious-SID documentation for more information)"
@@ -4378,31 +4352,44 @@
 "XSIDPLAY 互換の曲の長さデータベースを使用します. (より多くの情報は Audacious-"
 "SID の文書を参照してください)"
 
-#: src/sid/xmms-sid.glade:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr "XSIDPLAY 互換データベースを使う"
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 msgid "DB-file:"
 msgstr "DB ファイル:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr "データベースパスとファイル名"
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr "曲の長さデータベースファイルを参照"
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr "曲の長さデータベース:"
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 msgid "Songlength"
 msgstr "曲の長さ"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+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 "
@@ -4412,15 +4399,15 @@
 "Audacious-SID は HVSC SID が演奏された場合 STIL データベースから追加情報の使"
 "用・表示を行います."
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr "STIL データベースを使う"
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 msgid "STIL file:"
 msgstr "STIL ファイル:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
@@ -4428,15 +4415,15 @@
 "STIL データベースファイル (STIL.txt) のパスとファイル名を指定します.通常, "
 "HVSC のドキュメントのサブディレクトリです."
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr "STIL データベースファイルを参照"
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr "HVSC パス:"
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
@@ -4444,217 +4431,102 @@
 "High Voltage SID コレクション (HVSC) のベースディレクトリのパスを指定します. "
 "例: /media/C64Music/"
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr "HVSC パスを参照"
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr "SID Tune 情報リスト (STIL) データベース:"
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-"XMMS v1.2.5 以降は一般的なタイトル文字フォーマットをサポートしています (XMMS "
-"設定をご覧ください). 有効ならば, Audacious-SID で指定したものを上書きします. "
-"フォーマットルールは以下に説明があります."
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-msgid "Override generic XMMS titles"
-msgstr "一般的な XMMS のタイトルを上書きする"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-"%% - '%' 文字\n"
-"%p - 演奏者/作曲者\n"
-"%t - 曲名 (タイトル)\n"
-"%c - 著作権\n"
-"%s - ファイル形式\n"
-"%m - SID モデル"
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-"%C - 速度/クロック (PAL/NTSC)\n"
-"%n - サブチューン\n"
-"%N - サブチューン数\n"
-"%f - ファイル名\n"
-"%F - ファイルパス\n"
-"%e - ファイル拡張子"
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-msgid "Song name/title format:"
-msgstr "曲名/タイトルの書式:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-msgid "No sub-tune control."
-msgstr "サブチューンコントロールがありません."
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr "無効"
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-"後方/前方のシークは, XMMS-SidPlay で用いられるセレクタのように, 以前/以後のサ"
-"ブチューンを選択します. "
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr "後方/前方のシークでサブチューンを変更"
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-"シークバーを押すことで, UADE (Unix Amiga Delitracker Emulator) のようにサブ"
-"チューンコントロールウィンドウがポップアップします."
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr "シークバー経由でポップアップ (UADE-style)"
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-"シークバーがサブチューンセレクタとして動作します (XMMS に曲位置パッチを当てて"
-"いるなら最上のオプションです)."
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr "曲位置パッチ"
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-msgid "Sub-tune control:"
-msgstr "サブチューンコントロール:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr "ファイル中のサブチューンを一通り用いる"
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr "指定された最小の長さのチューンのみ"
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr "自動サブチューン変更:"
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-"ファイルの内容を確認してファイルが SID-tune かどうかを決定します. 選択されて"
-"いなければ, .sid や .dat などのファイル拡張子でファイルタイプを決定します."
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr "内容でファイルタイプを決定 (遅い)"
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr "雑多なオプション:"
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr "変更を承認して更新する"
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr "あらゆる変更を取り消す"
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 msgid "Audacious-SID Fileinfo"
 msgstr "Audacious-SID ファイル情報"
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr " < "
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr " > "
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr "曲名:"
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr "作曲者:"
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "著作権:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 msgid "Song Information:"
 msgstr "曲情報:"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr " "
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr "作者:"
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 msgid "Duration:"
 msgstr "持続時間:"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 msgid "Sub-tune Information:"
 msgstr "サブチューン情報:"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr "HVSC 曲の長さデータベースを選択"
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#, fuzzy
+msgid "Select STIL-database"
 msgstr "STIL データベースを選択"
 
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr "HVSC 位置のプレフィックスを選択"
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "フォーマット選択"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "はい"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "なし"
+
+#: src/sid/xs_fileinfo.c:238
 msgid "General info"
 msgstr "一般情報"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr "チューン #%i:"
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr "チューン #%i"
@@ -4677,32 +4549,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr "曲の長さ DB '%s' を開けませんでした.\n"
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr "曲の長さ DB ファイル '%s' の #%d 行の MD5 ハッシュが無効です!\n"
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr "曲の長さ DB ファイル '%s' の #%d 行のエントリが無効です!\n"
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr "曲の長さ DB ファイル '%s' の #%d 行が無効です!\n"
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr "ファイル '%s' は PSID でも RSID でもありません.\n"
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr "'%s' からの SID ファイルヘッダ読み込みでエラーが発生しました.\n"
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr "ファイル '%s' の一時データバッファの割り当てでエラーが発生しました.\n"
@@ -4743,72 +4615,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr "[SIDPlay2] エミュレーションエンジンを初期化できませんでした.\n"
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr "[SIDPlay2] フィルタ曲線の分点の数が不正です (%d > %d)\n"
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr "reSID->create() に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr "reSID->filter(%d) に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr "reSID->sampling(%d) に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr "reSID->filter(NULL) に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr "hardSID->create() に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr "hardSID->filter(%d) に失敗しました.\n"
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr "[SIDPlay2] SIDBuilder オブジェクトを初期化できませんでした.\n"
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr "[SIDPlay2] clockSpeed=%d は無効です. PAL にフォールバックします.\n"
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr "sid2OptLevel %d は無効です. %d にフォールバックします.\n"
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr "[SIDPlay2] エミュレーションエンジンの設定に失敗しました!\n"
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr "[SIDPlay2] SIDTune オブジェクトを初期化できませんでした.\n"
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr "[SIDPlay2] currTune->selectSong() に失敗しました.\n"
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr "[SIDPlay2] currTune->selectSong() に失敗しました.\n"
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr "[SIDPlay2] currEng->load() に失敗しました.\n"
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr "SubTune ポインタ構造体の realloc に失敗しました.\n"
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr "SubTune 構造体の malloc に失敗しました!\n"
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr "STILDB '%s' を開けませんでした.\n"
@@ -6090,6 +5967,145 @@
 msgid "About %s"
 msgstr "%s について"
 
+#~ 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)"
+
+#~ msgid "8580 (reSID)"
+#~ msgstr "8580 (reSID)"
+
+#~ msgid "6581R1 (alankila)"
+#~ msgstr "6581R1 (alankila)"
+
+#~ msgid "6581R4 (alankila)"
+#~ msgstr "6581R4 (alankila)"
+
+#~ msgid "Load"
+#~ msgstr "読み込み"
+
+#~ msgid ""
+#~ "XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
+#~ "preferences). This option can be enabled to override those generic titles "
+#~ "with Audacious-SID specific ones. Formatting mnemonics are explained "
+#~ "briefly below."
+#~ msgstr ""
+#~ "XMMS v1.2.5 以降は一般的なタイトル文字フォーマットをサポートしています "
+#~ "(XMMS 設定をご覧ください). 有効ならば, Audacious-SID で指定したものを上書"
+#~ "きします. フォーマットルールは以下に説明があります."
+
+#~ msgid "Override generic XMMS titles"
+#~ msgstr "一般的な XMMS のタイトルを上書きする"
+
+#~ msgid ""
+#~ "%% - '%' character\n"
+#~ "%p - Performer/composer\n"
+#~ "%t - Song name (title)\n"
+#~ "%c - Copyright\n"
+#~ "%s - File type\n"
+#~ "%m - SID model"
+#~ msgstr ""
+#~ "%% - '%' 文字\n"
+#~ "%p - 演奏者/作曲者\n"
+#~ "%t - 曲名 (タイトル)\n"
+#~ "%c - 著作権\n"
+#~ "%s - ファイル形式\n"
+#~ "%m - SID モデル"
+
+#~ msgid ""
+#~ "%C - Speed/clock (PAL/NTSC)\n"
+#~ "%n - Subtune\n"
+#~ "%N - Number of subtunes\n"
+#~ "%f - Filename\n"
+#~ "%F - File path\n"
+#~ "%e - File extension"
+#~ msgstr ""
+#~ "%C - 速度/クロック (PAL/NTSC)\n"
+#~ "%n - サブチューン\n"
+#~ "%N - サブチューン数\n"
+#~ "%f - ファイル名\n"
+#~ "%F - ファイルパス\n"
+#~ "%e - ファイル拡張子"
+
+#~ msgid "Song name/title format:"
+#~ msgstr "曲名/タイトルの書式:"
+
+#~ msgid "No sub-tune control."
+#~ msgstr "サブチューンコントロールがありません."
+
+#~ msgid "Disabled"
+#~ msgstr "無効"
+
+#~ msgid ""
+#~ "Seeking backwards/forwards selects previous/next sub-tune, similar to "
+#~ "selector used in XMMS-SidPlay."
+#~ msgstr ""
+#~ "後方/前方のシークは, XMMS-SidPlay で用いられるセレクタのように, 以前/以後"
+#~ "のサブチューンを選択します. "
+
+#~ msgid "Seek back/forward changes sub-tune"
+#~ msgstr "後方/前方のシークでサブチューンを変更"
+
+#~ msgid ""
+#~ "By pressing the seekbar a sub-tune control window pops up, in style of "
+#~ "UADE (Unix Amiga Delitracker Emulator)"
+#~ msgstr ""
+#~ "シークバーを押すことで, UADE (Unix Amiga Delitracker Emulator) のようにサ"
+#~ "ブチューンコントロールウィンドウがポップアップします."
+
+#~ msgid "Pop-up via seekbar (UADE-style)"
+#~ msgstr "シークバー経由でポップアップ (UADE-style)"
+
+#~ msgid ""
+#~ "Seekbar works as a sub-tune selector (Best option if you have patched "
+#~ "your XMMS with the song-position patch.)"
+#~ msgstr ""
+#~ "シークバーがサブチューンセレクタとして動作します (XMMS に曲位置パッチを当"
+#~ "てているなら最上のオプションです)."
+
+#~ msgid "Song-position patch"
+#~ msgstr "曲位置パッチ"
+
+#~ msgid "Go through all sub-tunes in file"
+#~ msgstr "ファイル中のサブチューンを一通り用いる"
+
+#~ msgid "Automatic sub-tune changes:"
+#~ msgstr "自動サブチューン変更:"
+
+#~ msgid ""
+#~ "Determine if file is a SID-tune by checking the file contents. If NOT "
+#~ "selected, filetype is determined by checking filename extension (.sid, ."
+#~ "dat, ...)"
+#~ msgstr ""
+#~ "ファイルの内容を確認してファイルが SID-tune かどうかを決定します. 選択され"
+#~ "ていなければ, .sid や .dat などのファイル拡張子でファイルタイプを決定しま"
+#~ "す."
+
+#~ msgid "Detect file by contents (slower)"
+#~ msgstr "内容でファイルタイプを決定 (遅い)"
+
+#~ msgid "Miscellaneous options:"
+#~ msgstr "雑多なオプション:"
+
+#~ msgid " < "
+#~ msgstr " < "
+
+#~ msgid " > "
+#~ msgstr " > "
+
+#~ msgid " "
+#~ msgstr " "
+
 #~ msgid "#"
 #~ msgstr "#"
 
--- a/po/ro.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/ro.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -44,7 +44,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -96,8 +96,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -131,14 +131,14 @@
 msgstr "Canale"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -251,28 +251,28 @@
 msgid "Subsong selection"
 msgstr "Selecția sub-melodiei"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr "Ordine: "
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr "Șablon: "
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr "Linie: "
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 msgid "Speed: "
 msgstr "Viteză: "
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 msgid "Timer: "
 msgstr "Cronometru: "
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -317,8 +317,8 @@
 "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:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Închide"
 
@@ -332,10 +332,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "Ok"
 
@@ -395,6 +395,10 @@
 msgid "h"
 msgstr "h"
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 msgid "Quiet after:"
 msgstr "Oprește după:"
@@ -455,10 +459,10 @@
 msgid "Fading"
 msgstr "Tranziție"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "secunde"
@@ -1352,8 +1356,8 @@
 "backend</span>"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 #, fuzzy
 msgid "Name:"
 msgstr "Numele Instrumentului"
@@ -1618,10 +1622,10 @@
 msgid "Skin file:"
 msgstr "Tipul Fișierului: "
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr ""
 
@@ -1705,7 +1709,7 @@
 msgstr "Declanşator"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 msgid "Misc"
 msgstr ""
 
@@ -1998,7 +2002,7 @@
 msgstr "Pauză"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr ""
 
@@ -2322,7 +2326,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 #, fuzzy
 msgid "Error"
@@ -2451,12 +2455,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2476,69 +2480,69 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:197
+#: 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:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 msgid "Configure"
 msgstr "Configurează"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr "Salvează în directorul original"
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr "Salvează în directorul specificat"
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 #, fuzzy
 msgid "Output file folder:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr "Alegeţi un director"
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 #, fuzzy
 msgid "Get filename from:"
 msgstr "După calea completă"
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 #, fuzzy
 msgid "original file tags"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 #, fuzzy
 msgid "original filename"
 msgstr "După Fișier"
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2979,8 +2983,7 @@
 msgid "ID3 format:"
 msgstr "Selecția formatelor"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 #, fuzzy
 msgid "Title"
 msgstr "Titlu"
@@ -3444,8 +3447,8 @@
 msgid "Use Album Gain"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 #, fuzzy
 msgid "Filename:"
 msgstr "Fișier:"
@@ -3459,8 +3462,8 @@
 msgid "Track:"
 msgstr "Informații despre Track"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 #, fuzzy
 msgid "Save"
 msgstr "Salvează"
@@ -3723,159 +3726,140 @@
 msgid "Scrobbler Error"
 msgstr "Eroare în Audacious"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-msgid "Subtune Control"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, fuzzy, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr "Nu s-a putut crea directorul (%s): %s\n"
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Developerii Audacious:"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 msgid "8-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 msgid "16-bit"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rezoluție"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 #, fuzzy
 msgid "Channels:"
 msgstr "Canale"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 msgid "Samplerate:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 msgid "Oversampling:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 #, fuzzy
 msgid "Audio"
 msgstr "Audio"
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 #, fuzzy
 msgid "PAL (50 Hz)"
 msgstr "Rata de eșantionare [Hz]:"
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 #, fuzzy
 msgid "NTSC (60 Hz)"
 msgstr "Rata de eșantionare [Hz]:"
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 msgid "Clock speed:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 msgid "Force model"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3883,91 +3867,91 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 msgid "SID model:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 #, fuzzy
 msgid "Emulation library selection:"
 msgstr "Șterge selecția anterioară înainte de a căuta"
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 msgid "Transparent ROM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Mod de Vizualizare"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -3976,49 +3960,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 #, fuzzy
 msgid "SIDPlay 2 options:"
 msgstr "Meniu de Opțiuni"
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 msgid "Resampling (FIR)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "<b>Convertor pentru rata de eșantionare</b>"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4026,383 +4010,288 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 #, fuzzy
 msgid "FM"
 msgstr "Radio Last.fm"
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-#, fuzzy
-msgid "Load"
-msgstr "Încarcă"
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+msgid "Export"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 #, fuzzy
 msgid "Import"
 msgstr "Importă"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-msgid "Export"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "Implicit"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 msgid "Filter curve:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 msgid "Play at least for specified time"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 msgid "Playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Tipul Fișierului: "
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 #, fuzzy
 msgid "Song length database:"
 msgstr "Pauză"
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 msgid "Songlength"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, 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
 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:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr "Foloseste baza de date STIL"
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 msgid "STIL file:"
 msgstr "Fisierul STIL:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 #, fuzzy
 msgid "HVSC path:"
 msgstr "Calea fisierului"
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-msgid "Override generic XMMS titles"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-msgid "Song name/title format:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-msgid "No sub-tune control."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-msgid "Disabled"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-#, fuzzy
-msgid "Song-position patch"
-msgstr "Pauză"
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-msgid "Sub-tune control:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-#, fuzzy
-msgid "Detect file by contents (slower)"
-msgstr "Detecția formatului după extensie."
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-#, fuzzy
-msgid "Miscellaneous options:"
-msgstr "Meniu de Opțiuni"
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr "Anuleaza toate schimbarile"
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr "Developerii Audacious:"
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 #, fuzzy
 msgid "Songname:"
 msgstr "Autoderularea Numelui Fișierului"
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Informații despre Track"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 #, fuzzy
 msgid "Author:"
 msgstr "Autor: "
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 msgid "Duration:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Informații despre Pluginul de ieșire"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-#, fuzzy
-msgid "Select STIL-database "
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+#, fuzzy
+msgid "Select STIL-database"
 msgstr "Alege fontul playlist-ului"
 
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "Selecția formatelor"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "da"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "Deselectează tot"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, fuzzy, c-format
 msgid "Tune #%i: "
 msgstr "Pornește"
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, fuzzy, c-format
 msgid "Tune #%i"
 msgstr "Pornește"
@@ -4425,32 +4314,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4487,74 +4376,79 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 #, fuzzy
 msgid "reSID->create() failed.\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, fuzzy, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr "<b>Convertor pentru rata de eșantionare</b>"
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 #, fuzzy
 msgid "hardSID->create() failed.\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, fuzzy, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
@@ -5806,6 +5700,26 @@
 msgid "About %s"
 msgstr "Despre %s"
 
+#, fuzzy
+#~ msgid "Could not allocate sidFilename ('%s')\n"
+#~ msgstr "Nu s-a putut crea directorul (%s): %s\n"
+
+#, fuzzy
+#~ msgid "Load"
+#~ msgstr "Încarcă"
+
+#, fuzzy
+#~ msgid "Song-position patch"
+#~ msgstr "Pauză"
+
+#, fuzzy
+#~ msgid "Detect file by contents (slower)"
+#~ msgstr "Detecția formatului după extensie."
+
+#, fuzzy
+#~ msgid "Miscellaneous options:"
+#~ msgstr "Meniu de Opțiuni"
+
 #~ msgid ":"
 #~ msgstr ":"
 
--- a/po/ru.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/ru.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+0200\n"
 "PO-Revision-Date: 2007-04-12 21:50+0300\n"
 "Last-Translator: Alexander Orlov <alxorlov@pochta.ru>\n"
 "Language-Team: none\n"
@@ -41,7 +41,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -94,8 +94,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -132,14 +132,14 @@
 msgstr "Каналы"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:280
 #: src/timidity/src/interface.c:167
 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:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Стерео"
 
@@ -254,30 +254,30 @@
 msgid "Subsong selection"
 msgstr "Выбор внутреннего модуля"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Речь"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Time Div:"
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Гц"
 
@@ -313,8 +313,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Закрыть"
 
@@ -328,10 +328,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "ОК"
 
@@ -384,6 +384,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -447,10 +451,10 @@
 msgid "Fading"
 msgstr "Усиления:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "секунд"
@@ -1392,8 +1396,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">определение</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1645,10 +1649,10 @@
 msgid "Skin file:"
 msgstr "Файл темы:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "Просмотреть"
 
@@ -1730,7 +1734,7 @@
 msgstr "События"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Диско"
@@ -2023,7 +2027,7 @@
 msgstr "Длительность песни по-умолчанию:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Преобразование частоты"
 
@@ -2384,7 +2388,7 @@
 "Невозможно открыть окно для неопознанного устройства.\n"
 "Убедитесь, что устройство правильно подключено."
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Ошибка"
@@ -2529,12 +2533,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "О модуле Flac"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2573,7 +2577,7 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2582,60 +2586,60 @@
 "Использование модуля записи на диск невозможно\n"
 "во время работы в режиме реального времени."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Настройка записи на диск"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Каталог для выходных файлов:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Настроить Эхо"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Каталог для выходных файлов:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Не удалять расширение имени файла"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -3085,8 +3089,7 @@
 msgid "ID3 format:"
 msgstr "Формат ID3-тега:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Название"
 
@@ -3542,8 +3545,8 @@
 msgid "Use Album Gain"
 msgstr "использовать Gain/Peak Альбома"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "Имя файла:"
 
@@ -3556,8 +3559,8 @@
 msgid "Track:"
 msgstr "Усиление дорожки:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3870,162 +3873,142 @@
 msgid "Scrobbler Error"
 msgstr "Модуль Scrobbler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Регулятор громкости:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Настройка Audacious OSD"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 бит"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 бит"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 #, fuzzy
 msgid "Resolution:"
 msgstr "Разрешение"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Частота:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Скорость воспроизведения"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 #, fuzzy
 msgid "Force model"
 msgstr "Режим дорожки"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -4033,92 +4016,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Транспонирование: "
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -4127,49 +4110,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Преобразование частоты"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Преобразование частоты:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4177,387 +4160,291 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#, fuzzy
+msgid "Export"
+msgstr "Порт"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 #, fuzzy
 msgid "Import"
 msgstr "Порт"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-#, fuzzy
-msgid "Export"
-msgstr "Порт"
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "По умолчанию"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Размер файла:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Воспроизводить на нормальной скорости"
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Режим воспроизведения:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Файл устройства:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Длительность песни по-умолчанию:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Файл темы:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Не использовать стандартные названия"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Формат названия:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Регулятор громкости:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-#, fuzzy
-msgid "Disabled"
-msgstr "переменный"
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Регулятор громкости:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD "
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Авторское право:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Информация"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Стиль"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Информация"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "Выбор внутреннего модуля"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "да"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "Нет"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "Основной"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4580,32 +4467,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4642,72 +4529,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -5996,6 +5888,26 @@
 msgstr "О программе %s"
 
 #, fuzzy
+#~ msgid "Subtune Control"
+#~ msgstr "Регулятор громкости:"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ msgstr "Не использовать стандартные названия"
+
+#, fuzzy
+#~ msgid "Song name/title format:"
+#~ msgstr "Формат названия:"
+
+#, fuzzy
+#~ msgid "No sub-tune control."
+#~ msgstr "Регулятор громкости:"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "переменный"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Гц"
 
--- a/po/sk.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/sk.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+0200\n"
 "PO-Revision-Date: 2007-03-14 02:18+0100\n"
 "Last-Translator: Andrej Herceg <herceg.andrej@zoznam.sk>\n"
 "Language-Team: \n"
@@ -39,7 +39,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -91,8 +91,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -129,14 +129,14 @@
 msgstr "Počet kanálov"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -251,30 +251,30 @@
 msgid "Subsong selection"
 msgstr "Výber koncového zariadenia"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Hovorené slovo"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Čas. pomer:"
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -310,8 +310,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -325,10 +325,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "OK"
 
@@ -381,6 +381,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -444,10 +448,10 @@
 msgid "Fading"
 msgstr "Rozsvietenie:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "sekúnd"
@@ -1383,8 +1387,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">štd.</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1636,10 +1640,10 @@
 msgid "Skin file:"
 msgstr "Súbor s motívom:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "Prechádzať"
 
@@ -1721,7 +1725,7 @@
 msgstr "Spúšťač"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
@@ -2014,7 +2018,7 @@
 msgstr "Štandardná dĺžka skladby:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Prevzorkovanie"
 
@@ -2371,7 +2375,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:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Chyba"
@@ -2516,12 +2520,12 @@
 "< james@develia.org >\n"
 "\n"
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "O module Flac"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2557,7 +2561,7 @@
 "nestalo, požiadajte o ňu Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2566,60 +2570,60 @@
 "Kým ste v režime reálneho času, nemôžete\n"
 "modul Disk Writer použiť."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Nastavenie Disk Writer"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Adresár s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Nastaviť ozvenu"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Adresár s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Neodstraňovať príponu mena súboru"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -3069,8 +3073,7 @@
 msgid "ID3 format:"
 msgstr "Formát ID3:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Názov"
 
@@ -3526,8 +3529,8 @@
 msgid "Use Album Gain"
 msgstr "použiť zosilnenie podľa vrcholu na albume"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "Meno súboru:"
 
@@ -3540,8 +3543,8 @@
 msgid "Track:"
 msgstr "Zosilnenie skladby:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Uložiť"
 
@@ -3844,162 +3847,142 @@
 msgid "Scrobbler Error"
 msgstr "Modul Scrobbler"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Ovládanie hlasitosti:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Nastavenia OSD pre Audacious"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bitov"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bitov"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 #, fuzzy
 msgid "Resolution:"
 msgstr "Rozlíšenie"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Počet kanálov:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Vzorkovacia frekvencia:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Rýchlosť prehrávania"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 #, fuzzy
 msgid "Force model"
 msgstr "Režim stopy"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -4007,92 +3990,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transponovať: "
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -4101,49 +4084,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Prevzorkovanie"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Prevzorkovať na:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4151,387 +4134,291 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#, fuzzy
+msgid "Export"
+msgstr "Port"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 #, fuzzy
 msgid "Import"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-#, fuzzy
-msgid "Export"
-msgstr "Port"
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "Štandardné"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Veľkosť súboru:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Prehrávať normálnou rýchlosťou"
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Spôsob prehrávania:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Meno súboru:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Štandardná dĺžka skladby:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Ovládanie hlasitosti:"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Súbor s motívom:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Používať vlastný formát názvu"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Formát názvu:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Ovládanie hlasitosti:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-#, fuzzy
-msgid "Disabled"
-msgstr "premenlivé"
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Ovládanie hlasitosti:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "OSD pre Audacious"
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Autorské práva:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Výzdoba"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Podrobnosti"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "Výber koncového zariadenia"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "áno"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "Žiadne"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "Všeobecné"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4554,32 +4441,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4616,72 +4503,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -5969,6 +5861,26 @@
 msgstr "O %s"
 
 #, fuzzy
+#~ msgid "Subtune Control"
+#~ msgstr "Ovládanie hlasitosti:"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ 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:"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "premenlivé"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Hz"
 
--- a/po/tr.po	Fri Sep 07 04:03:42 2007 -0500
+++ b/po/tr.po	Fri Sep 07 04:04:03 2007 -0500
@@ -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-08-30 18:23+0200\n"
+"POT-Creation-Date: 2007-09-05 00:28+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"
@@ -41,7 +41,7 @@
 #: 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:182 src/jack/configure.c:140
+#: 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
@@ -95,8 +95,8 @@
 #: 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:3599
-#: src/sid/xs_interface.c:1345 src/stereo_plugin/stereo.c:128
+#: 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
 msgid "Cancel"
@@ -133,14 +133,14 @@
 msgstr "Kanallar"
 
 #: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:899
-#: src/sid/xmms-sid.glade:156 src/sid/xs_interface.c:302
+#: 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/sid/xmms-sid.glade:175
-#: src/sid/xs_interface.c:309 src/timidity/src/interface.c:175
+#: src/modplug/gui/interface.cxx:195 src/sid/xmms-sid.glade:176
+#: src/sid/xs_interface.c:287 src/timidity/src/interface.c:175
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -255,30 +255,30 @@
 msgid "Subsong selection"
 msgstr "Backend bölümü"
 
-#: src/adplug/adplug-xmms.cc:688
+#: src/adplug/adplug-xmms.cc:730
 msgid "Order: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:689
+#: src/adplug/adplug-xmms.cc:731
 msgid "Pattern: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:691
+#: src/adplug/adplug-xmms.cc:733
 msgid "Row: "
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:692
+#: src/adplug/adplug-xmms.cc:734
 #, fuzzy
 msgid "Speed: "
 msgstr "Konuşma"
 
-#: src/adplug/adplug-xmms.cc:693
+#: src/adplug/adplug-xmms.cc:735
 #, fuzzy
 msgid "Timer: "
 msgstr "Zaman Böl:"
 
-#: src/adplug/adplug-xmms.cc:694 src/console/Audacious_Config.cxx:226
-#: src/sid/xmms-sid.glade:513 src/sid/xs_interface.c:361
+#: src/adplug/adplug-xmms.cc:736 src/console/Audacious_Config.cxx:226
+#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:333
 msgid "Hz"
 msgstr "Hz"
 
@@ -314,8 +314,8 @@
 msgstr ""
 
 #: src/alarm/interface.c:73 src/lirc/about.c:116
-#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:4262
-#: src/sid/xs_interface.c:1882
+#: src/modplug/gui/interface.cxx:946 src/sid/xmms-sid.glade:3493
+#: src/sid/xs_interface.c:1671
 msgid "Close"
 msgstr "Kapat"
 
@@ -329,10 +329,10 @@
 
 #: 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:199 src/flacng/plugin.c:743
+#: 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:3585
-#: src/sid/xs_interface.c:1338
+#: src/scrobbler/gtkstuff.c:43 src/sid/xmms-sid.glade:2916
+#: src/sid/xs_interface.c:1185
 msgid "OK"
 msgstr "Tamam"
 
@@ -385,6 +385,10 @@
 msgid "h"
 msgstr ""
 
+#: src/alarm/interface.c:538
+msgid "minutes"
+msgstr ""
+
 #: src/alarm/interface.c:556
 #, fuzzy
 msgid "Quiet after:"
@@ -448,10 +452,10 @@
 msgid "Fading"
 msgstr "Geciktirme:"
 
-#: src/alarm/interface.c:1089 src/sid/xmms-sid.glade:2271
-#: src/sid/xmms-sid.glade:2442 src/sid/xmms-sid.glade:3408
-#: src/sid/xs_interface.c:923 src/sid/xs_interface.c:977
-#: src/sid/xs_interface.c:1289
+#: 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
 #, fuzzy
 msgid "seconds"
 msgstr "saniye"
@@ -1321,8 +1325,8 @@
 "backend</span>"
 msgstr "<span size=\"smaller\">varsayılan</span>"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:4084
-#: src/sid/xs_interface.c:1828 src/vorbis/fileinfo.c:562
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3315
+#: src/sid/xs_interface.c:1615 src/vorbis/fileinfo.c:562
 msgid "Name:"
 msgstr "İsim:"
 
@@ -1573,10 +1577,10 @@
 msgid "Skin file:"
 msgstr "Arayüz Dosyası:"
 
-#: src/aosd/aosd_ui.c:641 src/sid/xmms-sid.glade:2595
-#: src/sid/xmms-sid.glade:2801 src/sid/xmms-sid.glade:2907
-#: src/sid/xs_interface.c:1024 src/sid/xs_interface.c:1093
-#: src/sid/xs_interface.c:1128
+#: 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
 msgid "Browse"
 msgstr "Araştır"
 
@@ -1658,7 +1662,7 @@
 msgstr "Başlat"
 
 #: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:87
-#: src/sid/xmms-sid.glade:3545 src/sid/xs_interface.c:1324
+#: src/sid/xmms-sid.glade:2876 src/sid/xs_interface.c:1171
 #, fuzzy
 msgid "Misc"
 msgstr "Disko"
@@ -1952,7 +1956,7 @@
 msgstr "Varsayılan şarkı uzunluğu:"
 
 #: src/console/Audacious_Config.cxx:201 src/modplug/gui/interface.cxx:264
-#: src/sid/xmms-sid.glade:1424 src/sid/xs_interface.c:673
+#: src/sid/xmms-sid.glade:1243 src/sid/xs_interface.c:645
 msgid "Resampling"
 msgstr "Yeniden örnekleme"
 
@@ -2288,7 +2292,7 @@
 "Ensure that the device has been correctly plugged in."
 msgstr ""
 
-#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:196
+#: src/evdev-plug/ed_ui.c:318 src/filewriter/filewriter.c:198
 #: src/madplug/plugin.c:620
 msgid "Error"
 msgstr "Hata"
@@ -2407,12 +2411,12 @@
 "written by Giacomo Lozito\n"
 msgstr ""
 
-#: src/filewriter/filewriter.c:167
+#: src/filewriter/filewriter.c:169
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Flac Eklentisi Hakkında"
 
-#: src/filewriter/filewriter.c:168
+#: src/filewriter/filewriter.c:170
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2451,7 +2455,7 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:197
+#: src/filewriter/filewriter.c:199
 #, fuzzy
 msgid ""
 "You cannot use the FileWriter plugin\n"
@@ -2460,60 +2464,60 @@
 "Gerçek zamanlı kipte çalışırken\n"
 "disk yazma eklentisini kullanamazsınız."
 
-#: src/filewriter/filewriter.c:512
+#: src/filewriter/filewriter.c:514
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Disk Yazıcı Ayarları"
 
-#: src/filewriter/filewriter.c:524
+#: src/filewriter/filewriter.c:526
 #, fuzzy
 msgid "Output file format:"
 msgstr "Çıktı dosya klasörü:"
 
-#: src/filewriter/filewriter.c:542 src/ladspa/ladspa.c:962
+#: src/filewriter/filewriter.c:544 src/ladspa/ladspa.c:962
 #, fuzzy
 msgid "Configure"
 msgstr "Yankı (Eko) Eklentisini Yapılandır"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:559
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:562
+#: src/filewriter/filewriter.c:564
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:574
+#: src/filewriter/filewriter.c:576
 msgid "Output file folder:"
 msgstr "Çıktı dosya klasörü:"
 
-#: src/filewriter/filewriter.c:578
+#: src/filewriter/filewriter.c:580
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:598
+#: src/filewriter/filewriter.c:600
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:601
+#: src/filewriter/filewriter.c:603
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:607
+#: src/filewriter/filewriter.c:609
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:617
+#: src/filewriter/filewriter.c:619
 msgid "Don't strip file name extension"
 msgstr "Dosya ismi uzantılarını daraltma"
 
-#: src/filewriter/filewriter.c:621
+#: src/filewriter/filewriter.c:623
 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:635
+#: src/filewriter/filewriter.c:637
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2963,8 +2967,7 @@
 msgid "ID3 format:"
 msgstr "ID3 biçimi:"
 
-#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:3144
-#: src/sid/xs_interface.c:1189 src/vorbis/configure.c:160
+#: src/madplug/configure.c:261 src/vorbis/configure.c:160
 msgid "Title"
 msgstr "Başlık"
 
@@ -3420,8 +3423,8 @@
 msgid "Use Album Gain"
 msgstr "Albümde Gain/Peak kullan"
 
-#: src/musepack/libmpc.cxx:490 src/sid/xmms-sid.glade:3755
-#: src/sid/xs_interface.c:1708 src/tta/libtta.c:322 src/wavpack/ui.cxx:150
+#: 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
 msgid "Filename:"
 msgstr "Dosya adı:"
 
@@ -3434,8 +3437,8 @@
 msgid "Track:"
 msgstr "Parça ses yüksekliği:"
 
-#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1996
-#: src/sid/xs_interface.c:835 src/wavpack/ui.cxx:265
+#: src/musepack/libmpc.cxx:550 src/sid/xmms-sid.glade:1732
+#: src/sid/xs_interface.c:812 src/wavpack/ui.cxx:265
 msgid "Save"
 msgstr "Kaydet"
 
@@ -3748,162 +3751,142 @@
 msgid "Scrobbler Error"
 msgstr "Scrobbler Eklentisi"
 
-#: src/sid/xmms-sid.c:207
+#: src/sid/xmms-sid.c:203
 msgid "Error initializing song-length database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:213
+#: src/sid/xmms-sid.c:209
 msgid "Error initializing STIL database!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:327
+#: src/sid/xmms-sid.c:414
 msgid "Couldn't allocate memory for audio data buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:334
+#: src/sid/xmms-sid.c:421
 msgid "Couldn't allocate memory for audio oversampling buffer!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:409
+#: src/sid/xmms-sid.c:436
 #, c-format
 msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:420
+#: src/sid/xmms-sid.c:446
 #, c-format
 msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:466
+#: src/sid/xmms-sid.c:491
 msgid "Oversampling rate-conversion pass failed.\n"
 msgstr ""
 
-#: src/sid/xmms-sid.c:770
-#, fuzzy
-msgid "Subtune Control"
-msgstr "Ses kontrolü:"
-
-#: src/sid/xmms-sid.c:1001
-#, c-format
-msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1008
-#, c-format
-msgid "Could not allocate sidFilename ('%s')\n"
-msgstr ""
-
-#: src/sid/xmms-sid.c:1017
-#, c-format
-msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:235
-#, fuzzy
-msgid "Audacious-SID Configuration"
+#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
+#, fuzzy
+msgid "Audacious-SID configuration"
 msgstr "Audacious OSD - yapılandırması"
 
-#: src/sid/xmms-sid.glade:70 src/sid/xs_interface.c:271
+#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:249
 #, fuzzy
 msgid "8-bit"
 msgstr "8 bit"
 
-#: src/sid/xmms-sid.glade:89 src/sid/xs_interface.c:278
+#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:256
 #, fuzzy
 msgid "16-bit"
 msgstr "16 bit"
 
-#: src/sid/xmms-sid.glade:110 src/sid/xs_interface.c:285
+#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:263
 #, fuzzy
 msgid "Resolution:"
 msgstr "Çözünürlük"
 
-#: src/sid/xmms-sid.glade:195 src/sid/xs_interface.c:316
+#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:294
 msgid "Autopanning"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:216 src/sid/xs_interface.c:323
+#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:301
 #: src/vorbis/fileinfo.c:867 src/vorbis/fileinfo.c:924
 msgid "Channels:"
 msgstr "Kanallar:"
 
-#: src/sid/xmms-sid.glade:565 src/sid/xs_interface.c:373
+#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:345
 #, fuzzy
 msgid "Samplerate:"
 msgstr "Örnekleme oranı:"
 
-#: src/sid/xmms-sid.glade:611 src/sid/xs_interface.c:390
+#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:362
 #, fuzzy
 msgid "Use oversampling"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:637 src/sid/xs_interface.c:401
+#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:373
 msgid "Factor:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:681 src/sid/xs_interface.c:413
+#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:385
 msgid "Large factors require more CPU-power"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:715 src/sid/xs_interface.c:419
+#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:391
 #, fuzzy
 msgid "Oversampling:"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:751 src/sid/xs_interface.c:424
+#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:396
 msgid "Audio"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:801 src/sid/xs_interface.c:456
+#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:428
 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:803 src/sid/xs_interface.c:452
+#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:424
 msgid "Force speed"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:821 src/sid/xs_interface.c:462
+#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:434
 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:823 src/sid/xs_interface.c:458
+#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:430
 msgid "PAL (50 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:841 src/sid/xs_interface.c:470
+#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:442
 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:843 src/sid/xs_interface.c:466
+#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:438
 msgid "NTSC (60 Hz)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:864 src/sid/xs_interface.c:474
+#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:446
 #, fuzzy
 msgid "Clock speed:"
 msgstr "Çalma hızı"
 
-#: src/sid/xmms-sid.glade:909 src/sid/xs_interface.c:495
+#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:467
 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:911 src/sid/xs_interface.c:491
+#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:463
 #, fuzzy
 msgid "Force model"
 msgstr "Çalma modu"
 
-#: src/sid/xmms-sid.glade:929 src/sid/xs_interface.c:501
+#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:473
 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 "
@@ -3911,92 +3894,92 @@
 "which enables playing of digital samples."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:931 src/sid/xs_interface.c:497
+#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:469
 msgid "MOS 6581"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:950 src/sid/xs_interface.c:505
+#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:477
 msgid "MOS 8580"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:971 src/sid/xs_interface.c:512
+#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:484
 #, fuzzy
 msgid "SID model:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:1023 src/sid/xs_interface.c:533
+#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:505
 msgid ""
 "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
 "cases, though."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1025 src/sid/xs_interface.c:529
+#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:501
 msgid "SIDPlay 1 (frame-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1044 src/sid/xs_interface.c:541
+#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:513
 msgid ""
 "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
 "emulation."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1046 src/sid/xs_interface.c:537
+#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:509
 msgid "SIDPlay 2 (cycle-based)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1068 src/sid/xs_interface.c:545
+#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:517
 msgid "Emulation library selection:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1114 src/sid/xs_interface.c:562
+#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:534
 msgid "Real C64 (SIDPlay 2 only)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:569
+#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:541
 msgid "Bank switching"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1153 src/sid/xs_interface.c:576
+#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:548
 #, fuzzy
 msgid "Transparent ROM"
 msgstr "Transpoze:"
 
-#: src/sid/xmms-sid.glade:1173 src/sid/xs_interface.c:583
+#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:555
 msgid "PlaySID environment"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1194 src/sid/xs_interface.c:590
+#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:562
 #, fuzzy
 msgid "Memory mode:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:1230 src/sid/xs_interface.c:595
+#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:567
 msgid "Emu#1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1274 src/sid/xs_interface.c:622
+#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:594
 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:1276 src/sid/xs_interface.c:618
+#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:590
 msgid "Optimization mode (faster, inaccurate)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1294 src/sid/xs_interface.c:628
+#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:600
 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:1296 src/sid/xs_interface.c:624
+#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:596
 msgid "reSID-emulation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1314 src/sid/xs_interface.c:636
+#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:608
 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 "
@@ -4005,49 +3988,49 @@
 "http://www.hardsid.com/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1316 src/sid/xs_interface.c:632
+#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:604
 msgid "HardSID"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1337 src/sid/xs_interface.c:640
+#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:612
 msgid "SIDPlay 2 options:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1382 src/sid/xs_interface.c:661
+#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:633
 msgid ""
 "Fastest and also worst sounding sampling method, simply picks nearest "
 "neighbouring sample."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1384 src/sid/xs_interface.c:657
+#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:629
 msgid "Fast (nearest neighbour)"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1402 src/sid/xs_interface.c:669
+#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:641
 msgid ""
 "Uses linear interpolation between samples, yielding higher audio quality "
 "with less sampling noise."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1404 src/sid/xs_interface.c:665
+#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:637
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1444 src/sid/xs_interface.c:680
+#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:652
 #, fuzzy
 msgid "Resampling (FIR)"
 msgstr "Yeniden örnekleme"
 
-#: src/sid/xmms-sid.glade:1465 src/sid/xs_interface.c:687
+#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:659
 #, fuzzy
 msgid "reSID sampling options:"
 msgstr "Örnekleme oranı:"
 
-#: src/sid/xmms-sid.glade:1501 src/sid/xs_interface.c:692
+#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:664
 msgid "Emu#2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1531 src/sid/xs_interface.c:708
+#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:680
 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 "
@@ -4055,387 +4038,291 @@
 "authentic at all if they utilize the filter."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1533 src/sid/xs_interface.c:704
+#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:676
 msgid "Emulate filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1590 src/sid/xs_interface.c:733
+#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:705
 msgid "FS"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1641 src/sid/xs_interface.c:750
+#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:722
 msgid "FM"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1692 src/sid/xs_interface.c:767
+#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:739
 msgid "FT"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1730 src/sid/xs_interface.c:778
+#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:750
 msgid "Reset values"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1759 src/sid/xs_interface.c:783
+#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:755
 msgid "SIDPlay1"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:1828 src/sid/xs_interface.c:807
-msgid "6581 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1854 src/sid/xs_interface.c:808
-msgid "8580 (reSID)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1880 src/sid/xs_interface.c:809
-msgid "6581R1 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1906 src/sid/xs_interface.c:810
-msgid "6581R4 (alankila)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:1975 src/sid/xs_interface.c:827
-msgid "Load"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2017 src/sid/xs_interface.c:843
+#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:796
+#, fuzzy
+msgid "Export"
+msgstr "Port"
+
+#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
+msgid "Use"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 #, fuzzy
 msgid "Import"
 msgstr "Port"
 
-#: src/sid/xmms-sid.glade:2038 src/sid/xs_interface.c:851
-#, fuzzy
-msgid "Export"
-msgstr "Port"
-
-#: src/sid/xmms-sid.glade:2083 src/sid/xs_interface.c:865
+#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
+#, fuzzy
+msgid "Delete"
+msgstr "Varsayılan"
+
+#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 #, fuzzy
 msgid "Filter curve:"
 msgstr "Dosya boytu:"
 
-#: src/sid/xmms-sid.glade:2119 src/sid/xs_interface.c:870
+#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:847
 msgid "SIDPlay2"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2155 src/sid/xs_interface.c:876
+#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:853
 msgid "Filters"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2199 src/sid/xs_interface.c:903
+#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:880
 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:2201 src/sid/xs_interface.c:899
+#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:876
 #, fuzzy
 msgid "Play at least for specified time"
 msgstr "Normal hızda çal"
 
-#: src/sid/xmms-sid.glade:2226 src/sid/xmms-sid.glade:2397
-#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:910
-#: src/sid/xs_interface.c:964 src/sid/xs_interface.c:1276
+#: 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
 #, fuzzy
 msgid "Playtime:"
 msgstr "Çalma kipi:"
 
-#: src/sid/xmms-sid.glade:2305 src/sid/xs_interface.c:930
+#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:907
 msgid "Minimum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2350 src/sid/xs_interface.c:951
+#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:928
 msgid ""
 "If enabled, tune is played until specified duration is reached (aka maximum "
 "playtime)."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2352 src/sid/xs_interface.c:947
+#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:924
 msgid "Play for specified time maximum"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2371 src/sid/xs_interface.c:957
+#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:934
 msgid ""
 "If enabled, the maximum playtime is applied only if song/tune length is not "
 "known."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2373 src/sid/xs_interface.c:953
+#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:930
 msgid "Only when song length is unknown"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2476 src/sid/xs_interface.c:984
+#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:961
 msgid "Maximum playtime:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2521 src/sid/xs_interface.c:1005
+#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:982
 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:2523 src/sid/xs_interface.c:1001
+#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:978
 msgid "Use XSIDPLAY-compatible database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2548 src/sid/xs_interface.c:1012
+#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:989
 #, fuzzy
 msgid "DB-file:"
 msgstr "Aygıt dosyası:"
 
-#: src/sid/xmms-sid.glade:2573 src/sid/xs_interface.c:1022
+#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:999
 msgid "Database path and filename"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2593 src/sid/xs_interface.c:1028
+#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1006
 msgid "Browse for song length-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2620 src/sid/xs_interface.c:1030
+#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1008
 msgid "Song length database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2656 src/sid/xs_interface.c:1035
+#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1013
 #, fuzzy
 msgid "Songlength"
 msgstr "Varsayılan şarkı uzunluğu:"
 
-#: src/sid/xmms-sid.glade:2700 src/sid/xs_interface.c:1062
+#: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
+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
+#, fuzzy
+msgid "Sub-tune handling:"
+msgstr "Ses kontrolü:"
+
+#: 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."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2702 src/sid/xs_interface.c:1058
+#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1088
 msgid "Use STIL database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2727 src/sid/xs_interface.c:1069
+#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:1099
 #, fuzzy
 msgid "STIL file:"
 msgstr "Arayüz Dosyası:"
 
-#: src/sid/xmms-sid.glade:2764 src/sid/xs_interface.c:1085
+#: src/sid/xmms-sid.glade:2669 src/sid/xs_interface.c:1115
 msgid ""
 "Path and filename of STIL database file (STIL.txt), usually found from "
 "HVSC's DOCUMENTS-subdirectory."
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2799 src/sid/xs_interface.c:1097
+#: src/sid/xmms-sid.glade:2704 src/sid/xs_interface.c:1128
 msgid "Browse for STIL-database file"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2833 src/sid/xs_interface.c:1104
+#: src/sid/xmms-sid.glade:2738 src/sid/xs_interface.c:1135
 msgid "HVSC path:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2870 src/sid/xs_interface.c:1120
+#: src/sid/xmms-sid.glade:2775 src/sid/xs_interface.c:1151
 msgid ""
 "Path to base-directory of your High Voltage SID Collection (HVSC), for "
 "example /media/C64Music/"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2905 src/sid/xs_interface.c:1132
+#: src/sid/xmms-sid.glade:2810 src/sid/xs_interface.c:1164
 msgid "Browse for HVSC path"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2935 src/sid/xs_interface.c:1134
+#: src/sid/xmms-sid.glade:2840 src/sid/xs_interface.c:1166
 msgid "SID Tune Information List (STIL) database:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:2980 src/sid/xs_interface.c:1155
-msgid ""
-"XMMS v1.2.5 and later support generic titlestring formatting (see XMMS "
-"preferences). This option can be enabled to override those generic titles "
-"with Audacious-SID specific ones. Formatting mnemonics are explained briefly "
-"below."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:2982 src/sid/xs_interface.c:1151
-#, fuzzy
-msgid "Override generic XMMS titles"
-msgstr "Genel başlıkları geçersiz kıl"
-
-#: src/sid/xmms-sid.glade:3032 src/sid/xs_interface.c:1172
-msgid ""
-"%% - '%' character\n"
-"%p - Performer/composer\n"
-"%t - Song name (title)\n"
-"%c - Copyright\n"
-"%s - File type\n"
-"%m - SID model"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3062 src/sid/xs_interface.c:1178
-msgid ""
-"%C - Speed/clock (PAL/NTSC)\n"
-"%n - Subtune\n"
-"%N - Number of subtunes\n"
-"%f - Filename\n"
-"%F - File path\n"
-"%e - File extension"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3108 src/sid/xs_interface.c:1184
-#, fuzzy
-msgid "Song name/title format:"
-msgstr "Başlık biçimi:"
-
-#: src/sid/xmms-sid.glade:3188 src/sid/xs_interface.c:1216
-#, fuzzy
-msgid "No sub-tune control."
-msgstr "Ses kontrolü:"
-
-#: src/sid/xmms-sid.glade:3190 src/sid/xs_interface.c:1212
-#, fuzzy
-msgid "Disabled"
-msgstr "Değişken"
-
-#: src/sid/xmms-sid.glade:3208 src/sid/xs_interface.c:1224
-msgid ""
-"Seeking backwards/forwards selects previous/next sub-tune, similar to "
-"selector used in XMMS-SidPlay."
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3210 src/sid/xs_interface.c:1220
-msgid "Seek back/forward changes sub-tune"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3229 src/sid/xs_interface.c:1232
-msgid ""
-"By pressing the seekbar a sub-tune control window pops up, in style of UADE "
-"(Unix Amiga Delitracker Emulator)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3231 src/sid/xs_interface.c:1228
-msgid "Pop-up via seekbar (UADE-style)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3250 src/sid/xs_interface.c:1240
-msgid ""
-"Seekbar works as a sub-tune selector (Best option if you have patched your "
-"XMMS with the song-position patch.)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3252 src/sid/xs_interface.c:1236
-msgid "Song-position patch"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3273 src/sid/xs_interface.c:1244
-#, fuzzy
-msgid "Sub-tune control:"
-msgstr "Ses kontrolü:"
-
-#: src/sid/xmms-sid.glade:3319 src/sid/xs_interface.c:1261
-msgid "Go through all sub-tunes in file"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3339 src/sid/xs_interface.c:1266
-msgid "Only tunes with specified minimum length "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3442 src/sid/xs_interface.c:1296
-msgid "Automatic sub-tune changes:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3487 src/sid/xs_interface.c:1317
-msgid ""
-"Determine if file is a SID-tune by checking the file contents. If NOT "
-"selected, filetype is determined by checking filename extension (.sid, ."
-"dat, ...)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3489 src/sid/xs_interface.c:1313
-msgid "Detect file by contents (slower)"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3509 src/sid/xs_interface.c:1319
-msgid "Miscellaneous options:"
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3582 src/sid/xs_interface.c:1343
+#: src/sid/xmms-sid.glade:2913 src/sid/xs_interface.c:1190
 msgid "Accept and update changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1350
+#: src/sid/xmms-sid.glade:2927 src/sid/xs_interface.c:1197
 msgid "Cancel any changes"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3620 src/sid/xs_interface.c:1651
+#: src/sid/xmms-sid.glade:2952 src/sid/xs_interface.c:1474
 #, fuzzy
 msgid "Audacious-SID Fileinfo"
 msgstr ""
 "\n"
 "Audacious OSD "
 
-#: src/sid/xmms-sid.glade:3674 src/sid/xs_interface.c:1677
-msgid " < "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3710 src/sid/xs_interface.c:1689
-msgid " > "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:3783 src/sid/xs_interface.c:1716
+#: src/sid/xmms-sid.glade:3022 src/sid/xs_interface.c:1503
 msgid "Songname:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3811 src/sid/xs_interface.c:1724
+#: src/sid/xmms-sid.glade:3050 src/sid/xs_interface.c:1511
 msgid "Composer:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:3839 src/sid/xs_interface.c:1732
+#: src/sid/xmms-sid.glade:3078 src/sid/xs_interface.c:1519
 #: src/vorbis/fileinfo.c:723
 msgid "Copyright:"
 msgstr "Telif Hakkı:"
 
-#: src/sid/xmms-sid.glade:3953 src/sid/xs_interface.c:1772
+#: src/sid/xmms-sid.glade:3192 src/sid/xs_interface.c:1563
 #, fuzzy
 msgid "Song Information:"
 msgstr "Bilgi"
 
-#: src/sid/xmms-sid.glade:4008 src/sid/xs_interface.c:1797
-msgid " "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4035 src/sid/xs_interface.c:1812
+#: src/sid/xmms-sid.glade:3266 src/sid/xs_interface.c:1598
 msgid "Author:"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4133 src/sid/xs_interface.c:1844
+#: src/sid/xmms-sid.glade:3364 src/sid/xs_interface.c:1632
 #, fuzzy
 msgid "Duration:"
 msgstr "Dekorasyon"
 
-#: src/sid/xmms-sid.glade:4227 src/sid/xs_interface.c:1877
+#: src/sid/xmms-sid.glade:3458 src/sid/xs_interface.c:1666
 #, fuzzy
 msgid "Sub-tune Information:"
 msgstr "Bilgi"
 
-#: src/sid/xmms-sid.glade:4281 src/sid/xs_interface.c:1951
+#: src/sid/xmms-sid.glade:3512 src/sid/xs_interface.c:1727
 msgid "Select HVSC song length database"
 msgstr ""
 
-#: src/sid/xmms-sid.glade:4322 src/sid/xs_interface.c:1989
-msgid "Select STIL-database "
-msgstr ""
-
-#: src/sid/xmms-sid.glade:4363 src/sid/xs_interface.c:2027
+#: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
+msgid "Select STIL-database"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3596 src/sid/xs_interface.c:1809
 msgid "Select HVSC location prefix"
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:315
+#: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
+msgid "Select SIDPlay2 filters file for importing"
+msgstr ""
+
+#: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
+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
+#, fuzzy
+msgid "Confirm selected action"
+msgstr "Backend bölümü"
+
+#: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
+#, fuzzy
+msgid "Yes"
+msgstr "evet"
+
+#: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
+#, fuzzy
+msgid "No"
+msgstr "Hiçbiri"
+
+#: src/sid/xs_fileinfo.c:238
 #, fuzzy
 msgid "General info"
 msgstr "Genel"
 
-#: src/sid/xs_fileinfo.c:325
+#: src/sid/xs_fileinfo.c:248
 #, c-format
 msgid "Tune #%i: "
 msgstr ""
 
-#: src/sid/xs_fileinfo.c:336
+#: src/sid/xs_fileinfo.c:259
 #, c-format
 msgid "Tune #%i"
 msgstr ""
@@ -4458,32 +4345,32 @@
 msgid "Could not open SongLengthDB '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:225
+#: src/sid/xs_length.c:224
 #, c-format
 msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:232
+#: src/sid/xs_length.c:231
 #, c-format
 msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
 msgstr ""
 
-#: src/sid/xs_length.c:237
+#: src/sid/xs_length.c:236
 #, c-format
 msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
 msgstr ""
 
-#: src/sid/xs_length.c:399
+#: src/sid/xs_length.c:398
 #, c-format
 msgid "Not a PSID or RSID file '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:418
+#: src/sid/xs_length.c:417
 #, c-format
 msgid "Error reading SID file header from '%s'\n"
 msgstr ""
 
-#: src/sid/xs_length.c:437
+#: src/sid/xs_length.c:436
 #, c-format
 msgid "Error allocating temp data buffer for file '%s'\n"
 msgstr ""
@@ -4520,72 +4407,77 @@
 msgid "[SIDPlay2] Could not initialize emulation engine.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:224
+#: src/sid/xs_sidplay2.cc:208
+#, c-format
+msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:229
 msgid "reSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:230
+#: src/sid/xs_sidplay2.cc:235
 #, c-format
 msgid "reSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:238
+#: src/sid/xs_sidplay2.cc:243
 #, c-format
 msgid "reSID->sampling(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:248
+#: src/sid/xs_sidplay2.cc:253
 msgid "reSID->filter(NULL) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:262
+#: src/sid/xs_sidplay2.cc:267
 msgid "hardSID->create() failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:268
+#: src/sid/xs_sidplay2.cc:273
 #, c-format
 msgid "hardSID->filter(%d) failed.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:276
+#: src/sid/xs_sidplay2.cc:281
 msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:290
+#: src/sid/xs_sidplay2.cc:295
 #, c-format
 msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:314
+#: src/sid/xs_sidplay2.cc:319
 #, c-format
 msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:338
+#: src/sid/xs_sidplay2.cc:343
 msgid "[SIDPlay2] Emulator engine configuration failed!\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:345
+#: src/sid/xs_sidplay2.cc:350
 msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
 msgstr ""
 
-#: src/sid/xs_sidplay2.cc:396
-msgid "[SIDPlay2] currTune->selectSong() failed\n"
-msgstr ""
-
 #: src/sid/xs_sidplay2.cc:401
+msgid "[SIDPlay2] currTune->selectSong() failed\n"
+msgstr ""
+
+#: src/sid/xs_sidplay2.cc:406
 msgid "[SIDPlay2] currEng->load() failed\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:44
+#: src/sid/xs_stil.c:46
 msgid "SubTune pointer structure realloc failed.\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:61
+#: src/sid/xs_stil.c:69
 msgid "SubTune structure malloc failed!\n"
 msgstr ""
 
-#: src/sid/xs_stil.c:168
+#: src/sid/xs_stil.c:176
 #, c-format
 msgid "Could not open STILDB '%s'\n"
 msgstr ""
@@ -5872,6 +5764,26 @@
 msgstr "%s Hakkında"
 
 #, fuzzy
+#~ msgid "Subtune Control"
+#~ msgstr "Ses kontrolü:"
+
+#, fuzzy
+#~ msgid "Override generic XMMS titles"
+#~ 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ü:"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "Değişken"
+
+#, fuzzy
 #~ msgid "22050"
 #~ msgstr "22000 Hz"
 
--- a/src/alarm/interface.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/alarm/interface.c	Fri Sep 07 04:04:03 2007 -0500
@@ -535,7 +535,7 @@
   gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_m_spin), GTK_UPDATE_IF_VALID);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
 
-  label78 = gtk_label_new ("minutes");
+  label78 = gtk_label_new (_("minutes"));
   gtk_widget_set_name (label78, "label78");
   gtk_widget_ref (label78);
   gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label78", label78,
--- a/src/cue/cuesheet.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/cue/cuesheet.c	Fri Sep 07 04:04:03 2007 -0500
@@ -291,7 +291,7 @@
 
     _tuple_copy_field(phys_tuple, out, "file-path");
     _tuple_copy_field(phys_tuple, out, "file-name");
-    _tuple_copy_field(phys_tuple, out, "file-exit");
+    _tuple_copy_field(phys_tuple, out, "file-ext");
     _tuple_copy_field(phys_tuple, out, "codec");
     _tuple_copy_field(phys_tuple, out, "quality");
     _tuple_copy_field(phys_tuple, out, "copyright");
--- a/src/filewriter/filewriter.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/filewriter/filewriter.c	Fri Sep 07 04:04:03 2007 -0500
@@ -23,6 +23,8 @@
 #include "filewriter.h"
 #include "plugins.h"
 
+struct format_info input;
+
 static GtkWidget *configure_win = NULL, *configure_vbox;
 static GtkWidget *path_hbox, *path_label, *path_dirbrowser;
 static GtkWidget *configure_bbox, *configure_ok, *configure_cancel;
--- a/src/filewriter/filewriter.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/filewriter/filewriter.h	Fri Sep 07 04:04:03 2007 -0500
@@ -41,7 +41,9 @@
     AFormat format;
     int frequency;
     int channels;
-} input;
+};
+
+extern struct format_info input;
 
 extern VFSFile *output_file;
 extern guint64 written;
--- a/src/madplug/Makefile	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/madplug/Makefile	Fri Sep 07 04:04:03 2007 -0500
@@ -20,6 +20,6 @@
 CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(SIMD_CFLAGS) -I../../intl -I../.. -Wall
 
 LDFLAGS += $(AUDLDFLAGS)
-LIBADD = -L/opt/local/lib -L$(plugindir) -Wl,-rpath=$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+LIBADD = -L/opt/local/lib -L$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
--- a/src/madplug/plugin.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/madplug/plugin.h	Fri Sep 07 04:04:03 2007 -0500
@@ -128,8 +128,8 @@
 };
 
 // global variables
-InputPlugin *mad_plugin;
-struct audmad_config_t audmad_config;
+extern InputPlugin *mad_plugin;
+extern struct audmad_config_t audmad_config;
 
 // gcond
 extern GMutex *mad_mutex;
--- a/src/modplug/gui/interface.cxx	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/gui/interface.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -18,6 +19,13 @@
 #include "interface.h"
 #include "support.h"
 
+#define GLADE_HOOKUP_OBJECT(component,widget,name) \
+  g_object_set_data_full (G_OBJECT (component), name, \
+    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+
+#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
+  g_object_set_data (G_OBJECT (component), name, widget)
+
 GtkWidget*
 create_Config (void)
 {
@@ -28,31 +36,73 @@
   GtkWidget *hbox2;
   GtkWidget *frame1;
   GtkWidget *vbox4;
-  GSList *vbox4_group = NULL;
   GtkWidget *bit16;
+  GSList *bit16_group = NULL;
   GtkWidget *bit8;
+  GtkWidget *xlabel2;
   GtkWidget *frame2;
   GtkWidget *vbox5;
-  GSList *vbox5_group = NULL;
   GtkWidget *stereo;
+  GSList *stereo_group = NULL;
   GtkWidget *mono;
-  GtkWidget *hbox10;
-  GtkWidget *frame3;
-  GtkWidget *vbox6;
-  GSList *vbox6_group = NULL;
-  GtkWidget *samp48;
-  GtkWidget *samp44;
-  GtkWidget *samp22;
-  GtkWidget *samp11;
+  GtkWidget *label3;
+  GtkWidget *hbox14;
   GtkWidget *frame9;
   GtkWidget *vbox15;
-  GSList *vbox15_group = NULL;
   GtkWidget *resampNearest;
+  GSList *resampNearest_group = NULL;
   GtkWidget *resampLinear;
   GtkWidget *resampSpline;
   GtkWidget *resampPolyphase;
+  GtkWidget *label4;
+  GtkWidget *frame3;
+  GtkWidget *vbox6;
+  GtkWidget *samp44;
+  GSList *samp44_group = NULL;
+  GtkWidget *samp22;
+  GtkWidget *samp11;
+  GtkWidget *label5;
   GtkWidget *label2;
   GtkWidget *vbox7;
+  GtkWidget *hbox15;
+  GtkWidget *frame5;
+  GtkWidget *vbox20;
+  GtkWidget *fxReverb;
+  GtkWidget *table1;
+  GtkWidget *fxReverbDepth;
+  GtkWidget *fxReverbDelay;
+  GtkWidget *xlabel3;
+  GtkWidget *xlabel4;
+  GtkWidget *label6;
+  GtkWidget *frame6;
+  GtkWidget *vbox21;
+  GtkWidget *fxBassBoost;
+  GtkWidget *table2;
+  GtkWidget *fxBassAmount;
+  GtkWidget *fxBassRange;
+  GtkWidget *xlabel5;
+  GtkWidget *xlabel6;
+  GtkWidget *label7;
+  GtkWidget *hbox16;
+  GtkWidget *frame7;
+  GtkWidget *vbox22;
+  GtkWidget *fxSurround;
+  GtkWidget *table3;
+  GtkWidget *fxSurroundDepth;
+  GtkWidget *fxSurroundDelay;
+  GtkWidget *xlabel7;
+  GtkWidget *label8;
+  GtkWidget *xlabel8;
+  GtkWidget *frame10;
+  GtkWidget *vbox16;
+  GtkWidget *fxPreamp;
+  GtkWidget *hbox11;
+  GtkWidget *label19;
+  GtkWidget *fxPreampLevel;
+  GtkWidget *label20;
+  GtkWidget *label9;
+  GtkWidget *label10;
+  GtkWidget *vbox19;
   GtkWidget *frame4;
   GtkWidget *hbox3;
   GtkWidget *vbox8;
@@ -61,703 +111,711 @@
   GtkWidget *vbox9;
   GtkWidget *fxNR;
   GtkWidget *fxAmigaMOD;
-  GtkWidget *frame5;
-  GtkWidget *hbox4;
-  GtkWidget *fxReverb;
-  GtkWidget *vbox10;
-  GtkWidget *table1;
-  GtkWidget *fxReverbDepth;
-  GtkWidget *fxReverbDelay;
-  GtkWidget *label3;
-  GtkWidget *label4;
-  GtkWidget *frame6;
-  GtkWidget *hbox5;
-  GtkWidget *fxBassBoost;
-  GtkWidget *vbox11;
-  GtkWidget *table2;
-  GtkWidget *fxBassAmount;
-  GtkWidget *fxBassRange;
-  GtkWidget *label5;
-  GtkWidget *label6;
-  GtkWidget *frame7;
-  GtkWidget *hbox6;
-  GtkWidget *fxSurround;
-  GtkWidget *vbox12;
-  GtkWidget *table3;
-  GtkWidget *fxSurroundDepth;
-  GtkWidget *fxSurroundDelay;
-  GtkWidget *label7;
-  GtkWidget *label8;
-  GtkWidget *frame10;
-  GtkWidget *vbox16;
-  GtkWidget *label20;
-  GtkWidget *hbox11;
-  GtkWidget *fxPreamp;
-  GtkWidget *label19;
-  GtkWidget *fxPreampLevel;
+  GtkWidget *label21;
   GtkWidget *frame11;
   GtkWidget *vbox17;
-  GSList *loopGroup_group = NULL;
   GtkWidget *fxNoLoop;
+  GSList *fxNoLoop_group = NULL;
   GtkWidget *hbox13;
   GtkWidget *fxLoopFinite;
   GtkObject *fxLoopCount_adj;
   GtkWidget *fxLoopCount;
-  GtkWidget *label21;
+  GtkWidget *xlabel21;
   GtkWidget *fxLoopForever;
-  GtkWidget *label10;
+  GtkWidget *label22;
+  GtkWidget *xlabel22;
   GtkWidget *hbuttonbox2;
   GtkWidget *config_ok;
   GtkWidget *config_apply;
   GtkWidget *config_cancel;
 
   Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (Config), "Config", Config);
-  gtk_widget_set_usize (Config, -1, -1);
+  gtk_widget_set_name (Config, "Config");
+  gtk_widget_set_size_request (Config, 500, -1);
   gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));
-  gtk_window_set_policy (GTK_WINDOW (Config), FALSE, FALSE, FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (Config), FALSE);
 
   vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox2),5);
-  gtk_widget_ref (vbox2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox2", vbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox2, "vbox2");
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (Config), vbox2);
 
   notebook1 = gtk_notebook_new ();
-  gtk_widget_ref (notebook1);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "notebook1", notebook1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (notebook1, "notebook1");
   gtk_widget_show (notebook1);
-  gtk_box_pack_start (GTK_BOX (vbox2), notebook1, TRUE, TRUE, 5);
-  gtk_container_set_border_width (GTK_CONTAINER (notebook1), 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), notebook1, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (notebook1), 4);
 
   vbox3 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox3);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox3", vbox3,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox3, "vbox3");
   gtk_widget_show (vbox3);
   gtk_container_add (GTK_CONTAINER (notebook1), vbox3);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox3), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox3), 2);
 
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox2", hbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  hbox2 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox2, "hbox2");
   gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox3), hbox2, FALSE, TRUE, 0);
 
-  frame1 = gtk_frame_new (_("Resolution"));
-  gtk_widget_ref (frame1);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame1", frame1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  frame1 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame1, "frame1");
   gtk_widget_show (frame1);
   gtk_box_pack_start (GTK_BOX (hbox2), frame1, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame1), 2);
 
   vbox4 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox4);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox4", vbox4,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox4, "vbox4");
   gtk_widget_show (vbox4);
   gtk_container_add (GTK_CONTAINER (frame1), vbox4);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox4), 2);
 
-  bit16 = gtk_radio_button_new_with_label (vbox4_group, _("16 bit"));
-  vbox4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (bit16));
-  gtk_widget_ref (bit16);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "bit16", bit16,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  bit16 = gtk_radio_button_new_with_mnemonic (NULL, _("16 bit"));
+  gtk_widget_set_name (bit16, "bit16");
   gtk_widget_show (bit16);
   gtk_box_pack_start (GTK_BOX (vbox4), bit16, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (bit16), bit16_group);
+  bit16_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bit16));
 
-  bit8 = gtk_radio_button_new_with_label (vbox4_group, _("8 bit"));
-  vbox4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (bit8));
-  gtk_widget_ref (bit8);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "bit8", bit8,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  bit8 = gtk_radio_button_new_with_mnemonic (NULL, _("8 bit"));
+  gtk_widget_set_name (bit8, "bit8");
   gtk_widget_show (bit8);
   gtk_box_pack_start (GTK_BOX (vbox4), bit8, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (bit8), bit16_group);
+  bit16_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bit8));
 
-  frame2 = gtk_frame_new (_("Channels"));
-  gtk_widget_ref (frame2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame2", frame2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  xlabel2 = gtk_label_new (_("Resolution"));
+  gtk_widget_set_name (xlabel2, "xlabel2");
+  gtk_widget_show (xlabel2);
+  gtk_frame_set_label_widget (GTK_FRAME (frame1), xlabel2);
+
+  frame2 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame2, "frame2");
   gtk_widget_show (frame2);
   gtk_box_pack_start (GTK_BOX (hbox2), frame2, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame2), 2);
 
   vbox5 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox5);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox5", vbox5,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox5, "vbox5");
   gtk_widget_show (vbox5);
   gtk_container_add (GTK_CONTAINER (frame2), vbox5);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox5), 2);
 
-  stereo = gtk_radio_button_new_with_label (vbox5_group, _("Stereo"));
-  vbox5_group = gtk_radio_button_group (GTK_RADIO_BUTTON (stereo));
-  gtk_widget_ref (stereo);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "stereo", stereo,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  stereo = gtk_radio_button_new_with_mnemonic (NULL, _("Stereo"));
+  gtk_widget_set_name (stereo, "stereo");
   gtk_widget_show (stereo);
   gtk_box_pack_start (GTK_BOX (vbox5), stereo, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (stereo), stereo_group);
+  stereo_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (stereo));
 
-  mono = gtk_radio_button_new_with_label (vbox5_group, _("Mono (downmix)"));
-  vbox5_group = gtk_radio_button_group (GTK_RADIO_BUTTON (mono));
-  gtk_widget_ref (mono);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "mono", mono,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  mono = gtk_radio_button_new_with_mnemonic (NULL, _("Mono (downmix)"));
+  gtk_widget_set_name (mono, "mono");
   gtk_widget_show (mono);
   gtk_box_pack_start (GTK_BOX (vbox5), mono, FALSE, FALSE, 0);
-
-  hbox10 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox10);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox10", hbox10,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox10);
-  gtk_box_pack_start (GTK_BOX (vbox3), hbox10, TRUE, TRUE, 0);
-
-  frame3 = gtk_frame_new (_("Sampling Rate"));
-  gtk_widget_ref (frame3);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame3", frame3,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame3);
-  gtk_box_pack_start (GTK_BOX (hbox10), frame3, TRUE, TRUE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (mono), stereo_group);
+  stereo_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (mono));
 
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox6);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox6", vbox6,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox6);
-  gtk_container_add (GTK_CONTAINER (frame3), vbox6);
-
-  samp48 = gtk_radio_button_new_with_label (vbox6_group, _("48 kHz"));
-  vbox6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (samp48));
-  gtk_widget_ref (samp48);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "samp48", samp48,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (samp48);
-  gtk_box_pack_start (GTK_BOX (vbox6), samp48, FALSE, FALSE, 0);
+  label3 = gtk_label_new (_("Channels"));
+  gtk_widget_set_name (label3, "label3");
+  gtk_widget_show (label3);
+  gtk_frame_set_label_widget (GTK_FRAME (frame2), label3);
 
-  samp44 = gtk_radio_button_new_with_label (vbox6_group, _("44 kHz"));
-  vbox6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (samp44));
-  gtk_widget_ref (samp44);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "samp44", samp44,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (samp44);
-  gtk_box_pack_start (GTK_BOX (vbox6), samp44, FALSE, FALSE, 0);
+  hbox14 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox14, "hbox14");
+  gtk_widget_show (hbox14);
+  gtk_box_pack_start (GTK_BOX (vbox3), hbox14, FALSE, TRUE, 0);
 
-  samp22 = gtk_radio_button_new_with_label (vbox6_group, _("22 kHz"));
-  vbox6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (samp22));
-  gtk_widget_ref (samp22);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "samp22", samp22,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (samp22);
-  gtk_box_pack_start (GTK_BOX (vbox6), samp22, FALSE, FALSE, 0);
-
-  samp11 = gtk_radio_button_new_with_label (vbox6_group, _("11 kHz"));
-  vbox6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (samp11));
-  gtk_widget_ref (samp11);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "samp11", samp11,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (samp11);
-  gtk_box_pack_start (GTK_BOX (vbox6), samp11, FALSE, FALSE, 0);
-
-  frame9 = gtk_frame_new (_("Resampling"));
-  gtk_widget_ref (frame9);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame9", frame9,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  frame9 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame9, "frame9");
   gtk_widget_show (frame9);
-  gtk_box_pack_start (GTK_BOX (hbox10), frame9, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox14), frame9, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame9), 2);
 
   vbox15 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox15);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox15", vbox15,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox15, "vbox15");
   gtk_widget_show (vbox15);
   gtk_container_add (GTK_CONTAINER (frame9), vbox15);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox15), 2);
 
-  resampNearest = gtk_radio_button_new_with_label (vbox15_group, _("Nearest (fastest)"));
-  vbox15_group = gtk_radio_button_group (GTK_RADIO_BUTTON (resampNearest));
-  gtk_widget_ref (resampNearest);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "resampNearest", resampNearest,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  resampNearest = gtk_radio_button_new_with_mnemonic (NULL, _("Nearest (fastest)"));
+  gtk_widget_set_name (resampNearest, "resampNearest");
   gtk_widget_show (resampNearest);
   gtk_box_pack_start (GTK_BOX (vbox15), resampNearest, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampNearest), resampNearest_group);
+  resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampNearest));
 
-  resampLinear = gtk_radio_button_new_with_label (vbox15_group, _("Linear (fast)"));
-  vbox15_group = gtk_radio_button_group (GTK_RADIO_BUTTON (resampLinear));
-  gtk_widget_ref (resampLinear);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "resampLinear", resampLinear,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  resampLinear = gtk_radio_button_new_with_mnemonic (NULL, _("Linear (fast)"));
+  gtk_widget_set_name (resampLinear, "resampLinear");
   gtk_widget_show (resampLinear);
   gtk_box_pack_start (GTK_BOX (vbox15), resampLinear, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampLinear), resampNearest_group);
+  resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampLinear));
 
-  resampSpline = gtk_radio_button_new_with_label (vbox15_group, _("Spline (good quality)"));
-  vbox15_group = gtk_radio_button_group (GTK_RADIO_BUTTON (resampSpline));
-  gtk_widget_ref (resampSpline);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "resampSpline", resampSpline,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  resampSpline = gtk_radio_button_new_with_mnemonic (NULL, _("Spline (good quality)"));
+  gtk_widget_set_name (resampSpline, "resampSpline");
   gtk_widget_show (resampSpline);
   gtk_box_pack_start (GTK_BOX (vbox15), resampSpline, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampSpline), resampNearest_group);
+  resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampSpline));
 
-  resampPolyphase = gtk_radio_button_new_with_label (vbox15_group, _("8-tap Fir (extremely high quality)"));
-  vbox15_group = gtk_radio_button_group (GTK_RADIO_BUTTON (resampPolyphase));
-  gtk_widget_ref (resampPolyphase);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "resampPolyphase", resampPolyphase,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  resampPolyphase = gtk_radio_button_new_with_mnemonic (NULL, _("8-tap Fir (extremely high quality)"));
+  gtk_widget_set_name (resampPolyphase, "resampPolyphase");
   gtk_widget_show (resampPolyphase);
   gtk_box_pack_start (GTK_BOX (vbox15), resampPolyphase, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampPolyphase), resampNearest_group);
+  resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampPolyphase));
+
+  label4 = gtk_label_new (_("Resampling"));
+  gtk_widget_set_name (label4, "label4");
+  gtk_widget_show (label4);
+  gtk_frame_set_label_widget (GTK_FRAME (frame9), label4);
+
+  frame3 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame3, "frame3");
+  gtk_widget_show (frame3);
+  gtk_box_pack_start (GTK_BOX (hbox14), frame3, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame3), 2);
+
+  vbox6 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox6, "vbox6");
+  gtk_widget_show (vbox6);
+  gtk_container_add (GTK_CONTAINER (frame3), vbox6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox6), 2);
+
+  samp44 = gtk_radio_button_new_with_mnemonic (NULL, _("44 kHz"));
+  gtk_widget_set_name (samp44, "samp44");
+  gtk_widget_show (samp44);
+  gtk_box_pack_start (GTK_BOX (vbox6), samp44, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp44), samp44_group);
+  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp44));
+
+  samp22 = gtk_radio_button_new_with_mnemonic (NULL, _("22 kHz"));
+  gtk_widget_set_name (samp22, "samp22");
+  gtk_widget_show (samp22);
+  gtk_box_pack_start (GTK_BOX (vbox6), samp22, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp22), samp44_group);
+  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp22));
+
+  samp11 = gtk_radio_button_new_with_mnemonic (NULL, _("11 kHz"));
+  gtk_widget_set_name (samp11, "samp11");
+  gtk_widget_show (samp11);
+  gtk_box_pack_start (GTK_BOX (vbox6), samp11, FALSE, FALSE, 0);
+  gtk_button_set_focus_on_click (GTK_BUTTON (samp11), FALSE);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp11), samp44_group);
+  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp11));
+
+  label5 = gtk_label_new (_("Sampling Rate"));
+  gtk_widget_set_name (label5, "label5");
+  gtk_widget_show (label5);
+  gtk_frame_set_label_widget (GTK_FRAME (frame3), label5);
 
   label2 = gtk_label_new (_("Quality"));
-  gtk_widget_ref (label2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label2", label2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label2, "label2");
   gtk_widget_show (label2);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label2);
+  gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER);
 
   vbox7 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox7);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox7", vbox7,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox7, "vbox7");
   gtk_widget_show (vbox7);
   gtk_container_add (GTK_CONTAINER (notebook1), vbox7);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox7), 6);
-
-  frame4 = gtk_frame_new (_("General"));
-  gtk_widget_ref (frame4);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame4", frame4,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame4);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame4, TRUE, TRUE, 0);
-
-  hbox3 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox3);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox3", hbox3,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox3);
-  gtk_container_add (GTK_CONTAINER (frame4), hbox3);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox7), 2);
 
-  vbox8 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox8);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox8", vbox8,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox8);
-  gtk_box_pack_start (GTK_BOX (hbox3), vbox8, TRUE, TRUE, 0);
-
-  fxUseFilename = gtk_check_button_new_with_label (_("Use Filename as Song Title"));
-  gtk_widget_ref (fxUseFilename);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxUseFilename", fxUseFilename,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (fxUseFilename);
-  gtk_box_pack_start (GTK_BOX (vbox8), fxUseFilename, FALSE, FALSE, 0);
-
-  fxFastInfo = gtk_check_button_new_with_label (_("Fast Playlist Info"));
-  gtk_widget_ref (fxFastInfo);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxFastInfo", fxFastInfo,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (fxFastInfo);
-  gtk_box_pack_start (GTK_BOX (vbox8), fxFastInfo, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxFastInfo), TRUE);
+  hbox15 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox15, "hbox15");
+  gtk_widget_show (hbox15);
+  gtk_box_pack_start (GTK_BOX (vbox7), hbox15, FALSE, TRUE, 0);
 
-  vbox9 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox9);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox9", vbox9,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox9);
-  gtk_box_pack_start (GTK_BOX (hbox3), vbox9, TRUE, TRUE, 0);
-
-  fxNR = gtk_check_button_new_with_label (_("Noise Reduction"));
-  gtk_widget_ref (fxNR);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxNR", fxNR,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (fxNR);
-  gtk_box_pack_start (GTK_BOX (vbox9), fxNR, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxNR), TRUE);
+  frame5 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame5, "frame5");
+  gtk_widget_show (frame5);
+  gtk_box_pack_start (GTK_BOX (hbox15), frame5, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame5), 2);
 
-  fxAmigaMOD = gtk_check_button_new_with_label (_("Play Amiga MOD"));
-  gtk_widget_ref (fxAmigaMOD);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxAmigaMOD", fxAmigaMOD,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (fxAmigaMOD);
-  gtk_box_pack_start (GTK_BOX (vbox9), fxAmigaMOD, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxAmigaMOD), TRUE);
+  vbox20 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox20, "vbox20");
+  gtk_widget_show (vbox20);
+  gtk_container_add (GTK_CONTAINER (frame5), vbox20);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox20), 2);
 
-  frame5 = gtk_frame_new (_("Reverb"));
-  gtk_widget_ref (frame5);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame5", frame5,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame5);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame5, TRUE, TRUE, 0);
-
-  hbox4 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox4);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox4", hbox4,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox4);
-  gtk_container_add (GTK_CONTAINER (frame5), hbox4);
-
-  fxReverb = gtk_check_button_new_with_label (_("Enable"));
-  gtk_widget_ref (fxReverb);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxReverb", fxReverb,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  fxReverb = gtk_check_button_new_with_mnemonic (_("Enable"));
+  gtk_widget_set_name (fxReverb, "fxReverb");
   gtk_widget_show (fxReverb);
-  gtk_box_pack_start (GTK_BOX (hbox4), fxReverb, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox20), fxReverb, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (fxReverb), 2);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxReverb), TRUE);
 
-  vbox10 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox10);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox10", vbox10,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox10);
-  gtk_box_pack_start (GTK_BOX (hbox4), vbox10, TRUE, TRUE, 0);
-
   table1 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_ref (table1);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "table1", table1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (table1, "table1");
   gtk_widget_show (table1);
-  gtk_box_pack_start (GTK_BOX (vbox10), table1, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox20), table1, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (table1), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table1), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table1), 4);
 
   fxReverbDepth = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 0, 100, 0, 0, 0)));
-  gtk_widget_ref (fxReverbDepth);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxReverbDepth", fxReverbDepth,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxReverbDepth, "fxReverbDepth");
   gtk_widget_show (fxReverbDepth);
   gtk_table_attach (GTK_TABLE (table1), fxReverbDepth, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
   fxReverbDelay = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (90, 40, 200, 0, 0, 0)));
-  gtk_widget_ref (fxReverbDelay);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxReverbDelay", fxReverbDelay,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxReverbDelay, "fxReverbDelay");
   gtk_widget_show (fxReverbDelay);
   gtk_table_attach (GTK_TABLE (table1), fxReverbDelay, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
-  label3 = gtk_label_new (_("Depth"));
-  gtk_widget_ref (label3);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label3", label3,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label3);
-  gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 0, 1,
+  xlabel3 = gtk_label_new (_("Depth"));
+  gtk_widget_set_name (xlabel3, "xlabel3");
+  gtk_widget_show (xlabel3);
+  gtk_table_attach (GTK_TABLE (table1), xlabel3, 0, 1, 0, 1,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel3), GTK_JUSTIFY_CENTER);
 
-  label4 = gtk_label_new (_("Delay"));
-  gtk_widget_ref (label4);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label4", label4,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label4);
-  gtk_table_attach (GTK_TABLE (table1), label4, 0, 1, 1, 2,
+  xlabel4 = gtk_label_new (_("Delay"));
+  gtk_widget_set_name (xlabel4, "xlabel4");
+  gtk_widget_show (xlabel4);
+  gtk_table_attach (GTK_TABLE (table1), xlabel4, 0, 1, 1, 2,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel4), GTK_JUSTIFY_CENTER);
 
-  frame6 = gtk_frame_new (_("Bass Boost"));
-  gtk_widget_ref (frame6);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame6", frame6,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame6);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame6, TRUE, TRUE, 0);
+  label6 = gtk_label_new (_("Reverb"));
+  gtk_widget_set_name (label6, "label6");
+  gtk_widget_show (label6);
+  gtk_frame_set_label_widget (GTK_FRAME (frame5), label6);
 
-  hbox5 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox5);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox5", hbox5,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox5);
-  gtk_container_add (GTK_CONTAINER (frame6), hbox5);
+  frame6 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame6, "frame6");
+  gtk_widget_show (frame6);
+  gtk_box_pack_start (GTK_BOX (hbox15), frame6, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame6), 2);
 
-  fxBassBoost = gtk_check_button_new_with_label (_("Enable"));
-  gtk_widget_ref (fxBassBoost);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxBassBoost", fxBassBoost,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox21 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox21, "vbox21");
+  gtk_widget_show (vbox21);
+  gtk_container_add (GTK_CONTAINER (frame6), vbox21);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox21), 2);
+
+  fxBassBoost = gtk_check_button_new_with_mnemonic (_("Enable"));
+  gtk_widget_set_name (fxBassBoost, "fxBassBoost");
   gtk_widget_show (fxBassBoost);
-  gtk_box_pack_start (GTK_BOX (hbox5), fxBassBoost, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox21), fxBassBoost, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (fxBassBoost), 2);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxBassBoost), TRUE);
 
-  vbox11 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox11);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox11", vbox11,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox11);
-  gtk_box_pack_start (GTK_BOX (hbox5), vbox11, TRUE, TRUE, 0);
-
   table2 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_ref (table2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "table2", table2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (table2, "table2");
   gtk_widget_show (table2);
-  gtk_box_pack_start (GTK_BOX (vbox11), table2, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox21), table2, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (table2), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table2), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
 
   fxBassAmount = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 0, 100, 0, 0, 0)));
-  gtk_widget_ref (fxBassAmount);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxBassAmount", fxBassAmount,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxBassAmount, "fxBassAmount");
   gtk_widget_show (fxBassAmount);
   gtk_table_attach (GTK_TABLE (table2), fxBassAmount, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
   fxBassRange = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 10, 100, 0, 0, 0)));
-  gtk_widget_ref (fxBassRange);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxBassRange", fxBassRange,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxBassRange, "fxBassRange");
   gtk_widget_show (fxBassRange);
   gtk_table_attach (GTK_TABLE (table2), fxBassRange, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
-  label5 = gtk_label_new (_("Amount"));
-  gtk_widget_ref (label5);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label5", label5,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label5);
-  gtk_table_attach (GTK_TABLE (table2), label5, 0, 1, 0, 1,
+  xlabel5 = gtk_label_new (_("Amount"));
+  gtk_widget_set_name (xlabel5, "xlabel5");
+  gtk_widget_show (xlabel5);
+  gtk_table_attach (GTK_TABLE (table2), xlabel5, 0, 1, 0, 1,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel5), GTK_JUSTIFY_CENTER);
 
-  label6 = gtk_label_new (_("Range"));
-  gtk_widget_ref (label6);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label6", label6,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label6);
-  gtk_table_attach (GTK_TABLE (table2), label6, 0, 1, 1, 2,
+  xlabel6 = gtk_label_new (_("Range"));
+  gtk_widget_set_name (xlabel6, "xlabel6");
+  gtk_widget_show (xlabel6);
+  gtk_table_attach (GTK_TABLE (table2), xlabel6, 0, 1, 1, 2,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel6), GTK_JUSTIFY_CENTER);
 
-  frame7 = gtk_frame_new (_("Surround"));
-  gtk_widget_ref (frame7);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame7", frame7,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame7);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame7, TRUE, TRUE, 0);
+  label7 = gtk_label_new (_("Bass Boost"));
+  gtk_widget_set_name (label7, "label7");
+  gtk_widget_show (label7);
+  gtk_frame_set_label_widget (GTK_FRAME (frame6), label7);
+
+  hbox16 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox16, "hbox16");
+  gtk_widget_show (hbox16);
+  gtk_box_pack_start (GTK_BOX (vbox7), hbox16, FALSE, TRUE, 0);
 
-  hbox6 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox6);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox6", hbox6,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox6);
-  gtk_container_add (GTK_CONTAINER (frame7), hbox6);
+  frame7 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame7, "frame7");
+  gtk_widget_show (frame7);
+  gtk_box_pack_start (GTK_BOX (hbox16), frame7, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame7), 2);
 
-  fxSurround = gtk_check_button_new_with_label (_("Enable"));
-  gtk_widget_ref (fxSurround);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxSurround", fxSurround,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox22 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox22, "vbox22");
+  gtk_widget_show (vbox22);
+  gtk_container_add (GTK_CONTAINER (frame7), vbox22);
+
+  fxSurround = gtk_check_button_new_with_mnemonic (_("Enable"));
+  gtk_widget_set_name (fxSurround, "fxSurround");
   gtk_widget_show (fxSurround);
-  gtk_box_pack_start (GTK_BOX (hbox6), fxSurround, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox22), fxSurround, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (fxSurround), 2);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxSurround), TRUE);
 
-  vbox12 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox12);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox12", vbox12,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox12);
-  gtk_box_pack_start (GTK_BOX (hbox6), vbox12, TRUE, TRUE, 0);
-
   table3 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_ref (table3);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "table3", table3,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (table3, "table3");
   gtk_widget_show (table3);
-  gtk_box_pack_start (GTK_BOX (vbox12), table3, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox22), table3, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (table3), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table3), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table3), 4);
 
   fxSurroundDepth = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (20, 0, 100, 0, 0, 0)));
-  gtk_widget_ref (fxSurroundDepth);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxSurroundDepth", fxSurroundDepth,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxSurroundDepth, "fxSurroundDepth");
   gtk_widget_show (fxSurroundDepth);
   gtk_table_attach (GTK_TABLE (table3), fxSurroundDepth, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
   fxSurroundDelay = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (20, 5, 40, 0, 0, 0)));
-  gtk_widget_ref (fxSurroundDelay);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxSurroundDelay", fxSurroundDelay,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxSurroundDelay, "fxSurroundDelay");
   gtk_widget_show (fxSurroundDelay);
   gtk_table_attach (GTK_TABLE (table3), fxSurroundDelay, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
-  label7 = gtk_label_new (_("Depth"));
-  gtk_widget_ref (label7);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label7", label7,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label7);
-  gtk_table_attach (GTK_TABLE (table3), label7, 0, 1, 0, 1,
+  xlabel7 = gtk_label_new (_("Depth"));
+  gtk_widget_set_name (xlabel7, "xlabel7");
+  gtk_widget_show (xlabel7);
+  gtk_table_attach (GTK_TABLE (table3), xlabel7, 0, 1, 0, 1,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel7), GTK_JUSTIFY_CENTER);
 
   label8 = gtk_label_new (_("Delay"));
-  gtk_widget_ref (label8);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label8", label8,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label8, "label8");
   gtk_widget_show (label8);
   gtk_table_attach (GTK_TABLE (table3), label8, 0, 1, 1, 2,
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_CENTER);
 
-  frame10 = gtk_frame_new (_("Preamp"));
-  gtk_widget_ref (frame10);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame10", frame10,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  xlabel8 = gtk_label_new (_("Surround"));
+  gtk_widget_set_name (xlabel8, "xlabel8");
+  gtk_widget_show (xlabel8);
+  gtk_frame_set_label_widget (GTK_FRAME (frame7), xlabel8);
+
+  frame10 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame10, "frame10");
   gtk_widget_show (frame10);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame10, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox16), frame10, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame10), 2);
 
-  vbox16 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox16);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox16", vbox16,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox16 = gtk_vbox_new (FALSE, 2);
+  gtk_widget_set_name (vbox16, "vbox16");
   gtk_widget_show (vbox16);
   gtk_container_add (GTK_CONTAINER (frame10), vbox16);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox16), 4);
 
-  label20 = gtk_label_new (_("Note:  Setting the preamp too high may cause\nclipping / distortion!"));
-  gtk_widget_ref (label20);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label20", label20,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label20);
-  gtk_box_pack_start (GTK_BOX (vbox16), label20, FALSE, FALSE, 0);
+  fxPreamp = gtk_check_button_new_with_mnemonic (_("Enable"));
+  gtk_widget_set_name (fxPreamp, "fxPreamp");
+  gtk_widget_show (fxPreamp);
+  gtk_box_pack_start (GTK_BOX (vbox16), fxPreamp, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (fxPreamp), 2);
 
-  hbox11 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox11);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox11", hbox11,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  hbox11 = gtk_hbox_new (FALSE, 4);
+  gtk_widget_set_name (hbox11, "hbox11");
   gtk_widget_show (hbox11);
   gtk_box_pack_start (GTK_BOX (vbox16), hbox11, TRUE, TRUE, 0);
 
-  fxPreamp = gtk_check_button_new_with_label (_("Enable"));
-  gtk_widget_ref (fxPreamp);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxPreamp", fxPreamp,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (fxPreamp);
-  gtk_box_pack_start (GTK_BOX (hbox11), fxPreamp, FALSE, FALSE, 0);
-
   label19 = gtk_label_new (_("Volume"));
-  gtk_widget_ref (label19);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label19", label19,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label19, "label19");
   gtk_widget_show (label19);
   gtk_box_pack_start (GTK_BOX (hbox11), label19, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (label19), GTK_JUSTIFY_CENTER);
 
   fxPreampLevel = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, -3, 3, 1, 0, 0)));
-  gtk_widget_ref (fxPreampLevel);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxPreampLevel", fxPreampLevel,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxPreampLevel, "fxPreampLevel");
   gtk_widget_show (fxPreampLevel);
   gtk_box_pack_start (GTK_BOX (hbox11), fxPreampLevel, TRUE, TRUE, 0);
 
-  frame11 = gtk_frame_new (_("Looping"));
-  gtk_widget_ref (frame11);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "frame11", frame11,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  label20 = gtk_label_new (_("Note:  Setting the preamp\ntoo high may cause clipping\n(annoying clicks and pops)!"));
+  gtk_widget_set_name (label20, "label20");
+  gtk_widget_show (label20);
+  gtk_box_pack_start (GTK_BOX (vbox16), label20, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (label20), GTK_JUSTIFY_CENTER);
+
+  label9 = gtk_label_new (_("Preamp"));
+  gtk_widget_set_name (label9, "label9");
+  gtk_widget_show (label9);
+  gtk_frame_set_label_widget (GTK_FRAME (frame10), label9);
+
+  label10 = gtk_label_new (_("Effects"));
+  gtk_widget_set_name (label10, "label10");
+  gtk_widget_show (label10);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label10);
+  gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_CENTER);
+
+  vbox19 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox19, "vbox19");
+  gtk_widget_show (vbox19);
+  gtk_container_add (GTK_CONTAINER (notebook1), vbox19);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox19), 2);
+
+  frame4 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame4, "frame4");
+  gtk_widget_show (frame4);
+  gtk_box_pack_start (GTK_BOX (vbox19), frame4, FALSE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame4), 2);
+
+  hbox3 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox3, "hbox3");
+  gtk_widget_show (hbox3);
+  gtk_container_add (GTK_CONTAINER (frame4), hbox3);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox3), 2);
+
+  vbox8 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox8, "vbox8");
+  gtk_widget_show (vbox8);
+  gtk_box_pack_start (GTK_BOX (hbox3), vbox8, TRUE, TRUE, 0);
+
+  fxUseFilename = gtk_check_button_new_with_mnemonic (_("Use Filename as Song Title"));
+  gtk_widget_set_name (fxUseFilename, "fxUseFilename");
+  gtk_widget_show (fxUseFilename);
+  gtk_box_pack_start (GTK_BOX (vbox8), fxUseFilename, FALSE, FALSE, 0);
+
+  fxFastInfo = gtk_check_button_new_with_mnemonic (_("Fast Playlist Info"));
+  gtk_widget_set_name (fxFastInfo, "fxFastInfo");
+  gtk_widget_show (fxFastInfo);
+  gtk_box_pack_start (GTK_BOX (vbox8), fxFastInfo, FALSE, FALSE, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxFastInfo), TRUE);
+
+  vbox9 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox9, "vbox9");
+  gtk_widget_show (vbox9);
+  gtk_box_pack_start (GTK_BOX (hbox3), vbox9, TRUE, TRUE, 0);
+
+  fxNR = gtk_check_button_new_with_mnemonic (_("Noise Reduction"));
+  gtk_widget_set_name (fxNR, "fxNR");
+  gtk_widget_show (fxNR);
+  gtk_box_pack_start (GTK_BOX (vbox9), fxNR, FALSE, FALSE, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxNR), TRUE);
+
+  fxAmigaMOD = gtk_check_button_new_with_mnemonic (_("Play Amiga MOD"));
+  gtk_widget_set_name (fxAmigaMOD, "fxAmigaMOD");
+  gtk_widget_show (fxAmigaMOD);
+  gtk_box_pack_start (GTK_BOX (vbox9), fxAmigaMOD, FALSE, FALSE, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxAmigaMOD), TRUE);
+
+  label21 = gtk_label_new (_("General"));
+  gtk_widget_set_name (label21, "label21");
+  gtk_widget_show (label21);
+  gtk_frame_set_label_widget (GTK_FRAME (frame4), label21);
+
+  frame11 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame11, "frame11");
   gtk_widget_show (frame11);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame11, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox19), frame11, FALSE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (frame11), 2);
 
   vbox17 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox17);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "vbox17", vbox17,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox17, "vbox17");
   gtk_widget_show (vbox17);
   gtk_container_add (GTK_CONTAINER (frame11), vbox17);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox17), 2);
 
-  fxNoLoop = gtk_radio_button_new_with_label (loopGroup_group, _("Don't loop"));
-  loopGroup_group = gtk_radio_button_group (GTK_RADIO_BUTTON (fxNoLoop));
-  gtk_widget_ref (fxNoLoop);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxNoLoop", fxNoLoop,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  fxNoLoop = gtk_radio_button_new_with_mnemonic (NULL, _("Don't loop"));
+  gtk_widget_set_name (fxNoLoop, "fxNoLoop");
   gtk_widget_show (fxNoLoop);
   gtk_box_pack_start (GTK_BOX (vbox17), fxNoLoop, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxNoLoop), fxNoLoop_group);
+  fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxNoLoop));
 
   hbox13 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox13);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbox13", hbox13,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (hbox13, "hbox13");
   gtk_widget_show (hbox13);
   gtk_box_pack_start (GTK_BOX (vbox17), hbox13, FALSE, FALSE, 0);
 
-  fxLoopFinite = gtk_radio_button_new_with_label (loopGroup_group, _("Loop"));
-  loopGroup_group = gtk_radio_button_group (GTK_RADIO_BUTTON (fxLoopFinite));
-  gtk_widget_ref (fxLoopFinite);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxLoopFinite", fxLoopFinite,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  fxLoopFinite = gtk_radio_button_new_with_mnemonic (NULL, _("Loop"));
+  gtk_widget_set_name (fxLoopFinite, "fxLoopFinite");
   gtk_widget_show (fxLoopFinite);
   gtk_box_pack_start (GTK_BOX (hbox13), fxLoopFinite, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxLoopFinite), fxNoLoop_group);
+  fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxLoopFinite));
 
   fxLoopCount_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   fxLoopCount = gtk_spin_button_new (GTK_ADJUSTMENT (fxLoopCount_adj), 1, 0);
-  gtk_widget_ref (fxLoopCount);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxLoopCount", fxLoopCount,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (fxLoopCount, "fxLoopCount");
   gtk_widget_show (fxLoopCount);
   gtk_box_pack_start (GTK_BOX (hbox13), fxLoopCount, FALSE, TRUE, 0);
 
-  label21 = gtk_label_new (_("time(s)"));
-  gtk_widget_ref (label21);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label21", label21,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label21);
-  gtk_box_pack_start (GTK_BOX (hbox13), label21, FALSE, FALSE, 0);
+  xlabel21 = gtk_label_new (_("time(s)"));
+  gtk_widget_set_name (xlabel21, "xlabel21");
+  gtk_widget_show (xlabel21);
+  gtk_box_pack_start (GTK_BOX (hbox13), xlabel21, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (xlabel21), GTK_JUSTIFY_CENTER);
 
-  fxLoopForever = gtk_radio_button_new_with_label (loopGroup_group, _("Loop forever"));
-  loopGroup_group = gtk_radio_button_group (GTK_RADIO_BUTTON (fxLoopForever));
-  gtk_widget_ref (fxLoopForever);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "fxLoopForever", fxLoopForever,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  fxLoopForever = gtk_radio_button_new_with_mnemonic (NULL, _("Loop forever"));
+  gtk_widget_set_name (fxLoopForever, "fxLoopForever");
   gtk_widget_show (fxLoopForever);
   gtk_box_pack_start (GTK_BOX (vbox17), fxLoopForever, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxLoopForever), fxNoLoop_group);
+  fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxLoopForever));
 
-  label10 = gtk_label_new (_("Effects"));
-  gtk_widget_ref (label10);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "label10", label10,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label10);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label10);
+  label22 = gtk_label_new (_("Looping"));
+  gtk_widget_set_name (label22, "label22");
+  gtk_widget_show (label22);
+  gtk_frame_set_label_widget (GTK_FRAME (frame11), label22);
+
+  xlabel22 = gtk_label_new (_("Misc"));
+  gtk_widget_set_name (xlabel22, "xlabel22");
+  gtk_widget_show (xlabel22);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), xlabel22);
+  gtk_label_set_justify (GTK_LABEL (xlabel22), GTK_JUSTIFY_CENTER);
 
   hbuttonbox2 = gtk_hbutton_box_new ();
-  gtk_widget_ref (hbuttonbox2);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "hbuttonbox2", hbuttonbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (hbuttonbox2, "hbuttonbox2");
   gtk_widget_show (hbuttonbox2);
   gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox2, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox2), 4);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox2), 5);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 8);
 
-  config_ok = gtk_button_new_with_label (_("OK"));
-  gtk_widget_ref (config_ok);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "config_ok", config_ok,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  config_ok = gtk_button_new_with_mnemonic (_("OK"));
+  gtk_widget_set_name (config_ok, "config_ok");
   gtk_widget_show (config_ok);
   gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_ok);
   GTK_WIDGET_SET_FLAGS (config_ok, GTK_CAN_DEFAULT);
 
-  config_apply = gtk_button_new_with_label (_("Apply"));
-  gtk_widget_ref (config_apply);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "config_apply", config_apply,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  config_apply = gtk_button_new_with_mnemonic (_("Apply"));
+  gtk_widget_set_name (config_apply, "config_apply");
   gtk_widget_show (config_apply);
   gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_apply);
   GTK_WIDGET_SET_FLAGS (config_apply, GTK_CAN_DEFAULT);
 
-  config_cancel = gtk_button_new_with_label (_("Cancel"));
-  gtk_widget_ref (config_cancel);
-  gtk_object_set_data_full (GTK_OBJECT (Config), "config_cancel", config_cancel,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  config_cancel = gtk_button_new_with_mnemonic (_("Cancel"));
+  gtk_widget_set_name (config_cancel, "config_cancel");
   gtk_widget_show (config_cancel);
   gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_cancel);
   GTK_WIDGET_SET_FLAGS (config_cancel, GTK_CAN_DEFAULT);
 
-  gtk_signal_connect (GTK_OBJECT (Config), "delete_event",
-                      GTK_SIGNAL_FUNC (hide_window),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (config_ok), "clicked",
-                      GTK_SIGNAL_FUNC (on_config_ok_clicked),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (config_apply), "clicked",
-                      GTK_SIGNAL_FUNC (on_config_apply_clicked),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (config_cancel), "clicked",
-                      GTK_SIGNAL_FUNC (on_config_cancel_clicked),
-                      NULL);
+  g_signal_connect ((gpointer) Config, "delete_event",
+                    G_CALLBACK (hide_window),
+                    NULL);
+  g_signal_connect ((gpointer) config_ok, "clicked",
+                    G_CALLBACK (on_config_ok_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) config_apply, "clicked",
+                    G_CALLBACK (on_config_apply_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) config_cancel, "clicked",
+                    G_CALLBACK (on_config_cancel_clicked),
+                    NULL);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (Config, Config, "Config");
+  GLADE_HOOKUP_OBJECT (Config, vbox2, "vbox2");
+  GLADE_HOOKUP_OBJECT (Config, notebook1, "notebook1");
+  GLADE_HOOKUP_OBJECT (Config, vbox3, "vbox3");
+  GLADE_HOOKUP_OBJECT (Config, hbox2, "hbox2");
+  GLADE_HOOKUP_OBJECT (Config, frame1, "frame1");
+  GLADE_HOOKUP_OBJECT (Config, vbox4, "vbox4");
+  GLADE_HOOKUP_OBJECT (Config, bit16, "bit16");
+  GLADE_HOOKUP_OBJECT (Config, bit8, "bit8");
+  GLADE_HOOKUP_OBJECT (Config, xlabel2, "xlabel2");
+  GLADE_HOOKUP_OBJECT (Config, frame2, "frame2");
+  GLADE_HOOKUP_OBJECT (Config, vbox5, "vbox5");
+  GLADE_HOOKUP_OBJECT (Config, stereo, "stereo");
+  GLADE_HOOKUP_OBJECT (Config, mono, "mono");
+  GLADE_HOOKUP_OBJECT (Config, label3, "label3");
+  GLADE_HOOKUP_OBJECT (Config, hbox14, "hbox14");
+  GLADE_HOOKUP_OBJECT (Config, frame9, "frame9");
+  GLADE_HOOKUP_OBJECT (Config, vbox15, "vbox15");
+  GLADE_HOOKUP_OBJECT (Config, resampNearest, "resampNearest");
+  GLADE_HOOKUP_OBJECT (Config, resampLinear, "resampLinear");
+  GLADE_HOOKUP_OBJECT (Config, resampSpline, "resampSpline");
+  GLADE_HOOKUP_OBJECT (Config, resampPolyphase, "resampPolyphase");
+  GLADE_HOOKUP_OBJECT (Config, label4, "label4");
+  GLADE_HOOKUP_OBJECT (Config, frame3, "frame3");
+  GLADE_HOOKUP_OBJECT (Config, vbox6, "vbox6");
+  GLADE_HOOKUP_OBJECT (Config, samp44, "samp44");
+  GLADE_HOOKUP_OBJECT (Config, samp22, "samp22");
+  GLADE_HOOKUP_OBJECT (Config, samp11, "samp11");
+  GLADE_HOOKUP_OBJECT (Config, label5, "label5");
+  GLADE_HOOKUP_OBJECT (Config, label2, "label2");
+  GLADE_HOOKUP_OBJECT (Config, vbox7, "vbox7");
+  GLADE_HOOKUP_OBJECT (Config, hbox15, "hbox15");
+  GLADE_HOOKUP_OBJECT (Config, frame5, "frame5");
+  GLADE_HOOKUP_OBJECT (Config, vbox20, "vbox20");
+  GLADE_HOOKUP_OBJECT (Config, fxReverb, "fxReverb");
+  GLADE_HOOKUP_OBJECT (Config, table1, "table1");
+  GLADE_HOOKUP_OBJECT (Config, fxReverbDepth, "fxReverbDepth");
+  GLADE_HOOKUP_OBJECT (Config, fxReverbDelay, "fxReverbDelay");
+  GLADE_HOOKUP_OBJECT (Config, xlabel3, "xlabel3");
+  GLADE_HOOKUP_OBJECT (Config, xlabel4, "xlabel4");
+  GLADE_HOOKUP_OBJECT (Config, label6, "label6");
+  GLADE_HOOKUP_OBJECT (Config, frame6, "frame6");
+  GLADE_HOOKUP_OBJECT (Config, vbox21, "vbox21");
+  GLADE_HOOKUP_OBJECT (Config, fxBassBoost, "fxBassBoost");
+  GLADE_HOOKUP_OBJECT (Config, table2, "table2");
+  GLADE_HOOKUP_OBJECT (Config, fxBassAmount, "fxBassAmount");
+  GLADE_HOOKUP_OBJECT (Config, fxBassRange, "fxBassRange");
+  GLADE_HOOKUP_OBJECT (Config, xlabel5, "xlabel5");
+  GLADE_HOOKUP_OBJECT (Config, xlabel6, "xlabel6");
+  GLADE_HOOKUP_OBJECT (Config, label7, "label7");
+  GLADE_HOOKUP_OBJECT (Config, hbox16, "hbox16");
+  GLADE_HOOKUP_OBJECT (Config, frame7, "frame7");
+  GLADE_HOOKUP_OBJECT (Config, vbox22, "vbox22");
+  GLADE_HOOKUP_OBJECT (Config, fxSurround, "fxSurround");
+  GLADE_HOOKUP_OBJECT (Config, table3, "table3");
+  GLADE_HOOKUP_OBJECT (Config, fxSurroundDepth, "fxSurroundDepth");
+  GLADE_HOOKUP_OBJECT (Config, fxSurroundDelay, "fxSurroundDelay");
+  GLADE_HOOKUP_OBJECT (Config, xlabel7, "xlabel7");
+  GLADE_HOOKUP_OBJECT (Config, label8, "label8");
+  GLADE_HOOKUP_OBJECT (Config, xlabel8, "xlabel8");
+  GLADE_HOOKUP_OBJECT (Config, frame10, "frame10");
+  GLADE_HOOKUP_OBJECT (Config, vbox16, "vbox16");
+  GLADE_HOOKUP_OBJECT (Config, fxPreamp, "fxPreamp");
+  GLADE_HOOKUP_OBJECT (Config, hbox11, "hbox11");
+  GLADE_HOOKUP_OBJECT (Config, label19, "label19");
+  GLADE_HOOKUP_OBJECT (Config, fxPreampLevel, "fxPreampLevel");
+  GLADE_HOOKUP_OBJECT (Config, label20, "label20");
+  GLADE_HOOKUP_OBJECT (Config, label9, "label9");
+  GLADE_HOOKUP_OBJECT (Config, label10, "label10");
+  GLADE_HOOKUP_OBJECT (Config, vbox19, "vbox19");
+  GLADE_HOOKUP_OBJECT (Config, frame4, "frame4");
+  GLADE_HOOKUP_OBJECT (Config, hbox3, "hbox3");
+  GLADE_HOOKUP_OBJECT (Config, vbox8, "vbox8");
+  GLADE_HOOKUP_OBJECT (Config, fxUseFilename, "fxUseFilename");
+  GLADE_HOOKUP_OBJECT (Config, fxFastInfo, "fxFastInfo");
+  GLADE_HOOKUP_OBJECT (Config, vbox9, "vbox9");
+  GLADE_HOOKUP_OBJECT (Config, fxNR, "fxNR");
+  GLADE_HOOKUP_OBJECT (Config, fxAmigaMOD, "fxAmigaMOD");
+  GLADE_HOOKUP_OBJECT (Config, label21, "label21");
+  GLADE_HOOKUP_OBJECT (Config, frame11, "frame11");
+  GLADE_HOOKUP_OBJECT (Config, vbox17, "vbox17");
+  GLADE_HOOKUP_OBJECT (Config, fxNoLoop, "fxNoLoop");
+  GLADE_HOOKUP_OBJECT (Config, hbox13, "hbox13");
+  GLADE_HOOKUP_OBJECT (Config, fxLoopFinite, "fxLoopFinite");
+  GLADE_HOOKUP_OBJECT (Config, fxLoopCount, "fxLoopCount");
+  GLADE_HOOKUP_OBJECT (Config, xlabel21, "xlabel21");
+  GLADE_HOOKUP_OBJECT (Config, fxLoopForever, "fxLoopForever");
+  GLADE_HOOKUP_OBJECT (Config, label22, "label22");
+  GLADE_HOOKUP_OBJECT (Config, xlabel22, "xlabel22");
+  GLADE_HOOKUP_OBJECT (Config, hbuttonbox2, "hbuttonbox2");
+  GLADE_HOOKUP_OBJECT (Config, config_ok, "config_ok");
+  GLADE_HOOKUP_OBJECT (Config, config_apply, "config_apply");
+  GLADE_HOOKUP_OBJECT (Config, config_cancel, "config_cancel");
 
   return Config;
 }
@@ -781,182 +839,160 @@
   GtkWidget *info_instruments;
   GtkWidget *label17;
   GtkWidget *scrolledwindow3;
-  GtkWidget *viewport3;
   GtkWidget *info_message;
   GtkWidget *label18;
   GtkWidget *hbuttonbox3;
   GtkWidget *info_close;
 
   Info = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (Info), "Info", Info);
-  gtk_widget_set_usize (Info, -1, 264);
+  gtk_widget_set_name (Info, "Info");
   gtk_window_set_title (GTK_WINDOW (Info), _("MOD Info"));
 
   vbox14 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox14);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "vbox14", vbox14,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (vbox14, "vbox14");
   gtk_widget_show (vbox14);
   gtk_container_add (GTK_CONTAINER (Info), vbox14);
 
   notebook2 = gtk_notebook_new ();
-  gtk_widget_ref (notebook2);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "notebook2", notebook2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (notebook2, "notebook2");
   gtk_widget_show (notebook2);
   gtk_box_pack_start (GTK_BOX (vbox14), notebook2, TRUE, TRUE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (notebook2), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (notebook2), 4);
 
   hbox9 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox9);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "hbox9", hbox9,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (hbox9, "hbox9");
   gtk_widget_show (hbox9);
   gtk_container_add (GTK_CONTAINER (notebook2), hbox9);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox9), 2);
 
   label11 = gtk_label_new (_("Filename:\nTitle:\nType:\nLength:\nSpeed:\nTempo:\nSamples:\nInstruments:\nPatterns:\nChannels:"));
-  gtk_widget_ref (label11);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "label11", label11,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label11, "label11");
   gtk_widget_show (label11);
   gtk_box_pack_start (GTK_BOX (hbox9), label11, FALSE, FALSE, 4);
-  gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT);
 
-  info_general = gtk_label_new ("---\n---\n---\n---\n---\n---\n---\n---\n---\n---");
-  gtk_widget_ref (info_general);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "info_general", info_general,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  info_general = gtk_label_new (_("---\n---\n---\n---\n---\n---\n---\n---\n---\n---"));
+  gtk_widget_set_name (info_general, "info_general");
   gtk_widget_show (info_general);
   gtk_box_pack_start (GTK_BOX (hbox9), info_general, FALSE, FALSE, 4);
-  gtk_label_set_justify (GTK_LABEL (info_general), GTK_JUSTIFY_LEFT);
 
   label13 = gtk_label_new (_("General"));
-  gtk_widget_ref (label13);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "label13", label13,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label13, "label13");
   gtk_widget_show (label13);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label13);
+  gtk_label_set_justify (GTK_LABEL (label13), GTK_JUSTIFY_CENTER);
 
   scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_ref (scrolledwindow1);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "scrolledwindow1", scrolledwindow1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
   gtk_widget_show (scrolledwindow1);
   gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow1);
   gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow1), 6);
+  GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
   viewport1 = gtk_viewport_new (NULL, NULL);
-  gtk_widget_ref (viewport1);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "viewport1", viewport1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (viewport1, "viewport1");
   gtk_widget_show (viewport1);
   gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
 
   info_samples = gtk_label_new ("");
-  gtk_widget_ref (info_samples);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "info_samples", info_samples,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (info_samples, "info_samples");
   gtk_widget_show (info_samples);
   gtk_container_add (GTK_CONTAINER (viewport1), info_samples);
-  gtk_label_set_justify (GTK_LABEL (info_samples), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (info_samples), 7.45058e-09, 7.45058e-09);
-  gtk_label_set_selectable(GTK_LABEL (info_samples), TRUE);
 
   label15 = gtk_label_new (_("Samples"));
-  gtk_widget_ref (label15);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "label15", label15,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label15, "label15");
   gtk_widget_show (label15);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label15);
+  gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER);
 
   scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_ref (scrolledwindow2);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "scrolledwindow2", scrolledwindow2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
   gtk_widget_show (scrolledwindow2);
   gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow2);
   gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow2), 6);
+  GTK_WIDGET_UNSET_FLAGS (scrolledwindow2, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
   viewport2 = gtk_viewport_new (NULL, NULL);
-  gtk_widget_ref (viewport2);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "viewport2", viewport2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (viewport2, "viewport2");
   gtk_widget_show (viewport2);
   gtk_container_add (GTK_CONTAINER (scrolledwindow2), viewport2);
 
   info_instruments = gtk_label_new ("");
-  gtk_widget_ref (info_instruments);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "info_instruments", info_instruments,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (info_instruments, "info_instruments");
   gtk_widget_show (info_instruments);
   gtk_container_add (GTK_CONTAINER (viewport2), info_instruments);
-  gtk_label_set_justify (GTK_LABEL (info_instruments), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (info_instruments), 1.49012e-08, 7.45058e-09);
-  gtk_label_set_selectable(GTK_LABEL (info_instruments), TRUE);
 
   label17 = gtk_label_new (_("Instruments"));
-  gtk_widget_ref (label17);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "label17", label17,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label17, "label17");
   gtk_widget_show (label17);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label17);
+  gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_CENTER);
 
   scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_ref (scrolledwindow3);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "scrolledwindow3", scrolledwindow3,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (scrolledwindow3, "scrolledwindow3");
   gtk_widget_show (scrolledwindow3);
   gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow3);
-  gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow3), 6);
+  GTK_WIDGET_UNSET_FLAGS (scrolledwindow3, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
-  viewport3 = gtk_viewport_new (NULL, NULL);
-  gtk_widget_ref (viewport3);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "viewport3", viewport3,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (viewport3);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow3), viewport3);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_SHADOW_IN);
 
-  info_message = gtk_label_new ("");
-  gtk_widget_ref (info_message);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "info_message", info_message,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  info_message = gtk_text_view_new ();
+  gtk_widget_set_name (info_message, "info_message");
   gtk_widget_show (info_message);
-  gtk_container_add (GTK_CONTAINER (viewport3), info_message);
-  gtk_label_set_justify (GTK_LABEL (info_message), GTK_JUSTIFY_LEFT);
-  gtk_label_set_line_wrap(GTK_LABEL (info_message), TRUE);
-  gtk_label_set_selectable(GTK_LABEL (info_message), TRUE);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow3), info_message);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (info_message), FALSE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (info_message), GTK_WRAP_WORD);
 
   label18 = gtk_label_new (_("Message"));
-  gtk_widget_ref (label18);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "label18", label18,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (label18, "label18");
   gtk_widget_show (label18);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label18);
+  gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER);
 
   hbuttonbox3 = gtk_hbutton_box_new ();
-  gtk_widget_ref (hbuttonbox3);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "hbuttonbox3", hbuttonbox3,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_name (hbuttonbox3, "hbuttonbox3");
   gtk_widget_show (hbuttonbox3);
   gtk_box_pack_start (GTK_BOX (vbox14), hbuttonbox3, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox3), 2);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox3), 30);
 
-  info_close = gtk_button_new_with_label (_("Close"));
-  gtk_widget_ref (info_close);
-  gtk_object_set_data_full (GTK_OBJECT (Info), "info_close", info_close,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  info_close = gtk_button_new_with_mnemonic (_("Close"));
+  gtk_widget_set_name (info_close, "info_close");
   gtk_widget_show (info_close);
   gtk_container_add (GTK_CONTAINER (hbuttonbox3), info_close);
   GTK_WIDGET_SET_FLAGS (info_close, GTK_CAN_DEFAULT);
 
-  gtk_signal_connect (GTK_OBJECT (Info), "delete_event",
-                      GTK_SIGNAL_FUNC (hide_window),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (info_close), "clicked",
-                      GTK_SIGNAL_FUNC (on_info_close_clicked),
-                      NULL);
+  g_signal_connect ((gpointer) Info, "delete_event",
+                    G_CALLBACK (hide_window),
+                    NULL);
+  g_signal_connect ((gpointer) info_close, "clicked",
+                    G_CALLBACK (on_info_close_clicked),
+                    NULL);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (Info, Info, "Info");
+  GLADE_HOOKUP_OBJECT (Info, vbox14, "vbox14");
+  GLADE_HOOKUP_OBJECT (Info, notebook2, "notebook2");
+  GLADE_HOOKUP_OBJECT (Info, hbox9, "hbox9");
+  GLADE_HOOKUP_OBJECT (Info, label11, "label11");
+  GLADE_HOOKUP_OBJECT (Info, info_general, "info_general");
+  GLADE_HOOKUP_OBJECT (Info, label13, "label13");
+  GLADE_HOOKUP_OBJECT (Info, scrolledwindow1, "scrolledwindow1");
+  GLADE_HOOKUP_OBJECT (Info, viewport1, "viewport1");
+  GLADE_HOOKUP_OBJECT (Info, info_samples, "info_samples");
+  GLADE_HOOKUP_OBJECT (Info, label15, "label15");
+  GLADE_HOOKUP_OBJECT (Info, scrolledwindow2, "scrolledwindow2");
+  GLADE_HOOKUP_OBJECT (Info, viewport2, "viewport2");
+  GLADE_HOOKUP_OBJECT (Info, info_instruments, "info_instruments");
+  GLADE_HOOKUP_OBJECT (Info, label17, "label17");
+  GLADE_HOOKUP_OBJECT (Info, scrolledwindow3, "scrolledwindow3");
+  GLADE_HOOKUP_OBJECT (Info, info_message, "info_message");
+  GLADE_HOOKUP_OBJECT (Info, label18, "label18");
+  GLADE_HOOKUP_OBJECT (Info, hbuttonbox3, "hbuttonbox3");
+  GLADE_HOOKUP_OBJECT (Info, info_close, "info_close");
 
   return Info;
 }
--- a/src/modplug/gui/main.cxx	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/gui/main.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -9,7 +9,10 @@
 
 #include <gtk/gtk.h>
 #include <libintl.h>
+extern "C" {
 #include "audacious/util.h"
+#include "audacious/strings.h"
+}
 
 #include "interface.h"
 #include "support.h"
@@ -152,7 +155,7 @@
 
 	uint32 lSongTime, lNumSamples, lNumInstruments, i;
 	string lInfo;
-	char lBuffer[33];
+	gchar lBuffer[33];
 	stringstream lStrStream(ios::out);   //C++ replacement for sprintf()
 
 	CSoundFile* lSoundFile;
@@ -160,6 +163,7 @@
 	Archive* lArchive;
 	string lShortFN;
 	uint32 lPos;
+	gchar *tmps;
 
 	lPos = aFilename.find_last_of('/') + 1;
 	lShortFN = aFilename.substr(lPos);
@@ -177,7 +181,9 @@
 
 	lInfo = lShortFN;
 	lInfo += '\n';
-	lInfo += lSoundFile->GetTitle();
+	tmps = str_to_utf8(lSoundFile->GetTitle());
+	lInfo += tmps;
+	g_free(tmps);
 	lInfo += '\n';
 
 	switch(lSoundFile->GetType())
@@ -275,7 +281,9 @@
 	for(i = 0; i < lNumSamples; i++)
 	{
 		lSoundFile->GetSampleName(i, lBuffer);
-		lInfo += lBuffer;
+		tmps = str_to_utf8(lBuffer);
+		lInfo += tmps;
+		g_free(tmps);
 		lInfo += '\n';
 	}
 	gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_samples"), lInfo.c_str());
@@ -284,7 +292,9 @@
 	for(i = 0; i < lNumInstruments; i++)
 	{
 		lSoundFile->GetInstrumentName(i, lBuffer);
-		lInfo += lBuffer;
+		tmps = str_to_utf8(lBuffer);
+		lInfo += tmps;
+		g_free(tmps);
 		lInfo += '\n';
 	}
 	gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_instruments"), lInfo.c_str());
@@ -296,7 +306,9 @@
 	//gtk_text_backward_delete(textbox, length);
 	length = lSoundFile->GetSongComments(message, MAX_MESSAGE_LENGTH, 80);
 	if (length != 0) {
-		gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_message"), message);
+		tmps = str_to_utf8(message);
+		gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_message"), tmps);
+		g_free(tmps);
 	}
 	
 	//unload the file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/modplug/gui/modplug.glade	Fri Sep 07 04:04:03 2007 -0500
@@ -0,0 +1,2028 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="Config">
+  <property name="width_request">500</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">ModPlug Configuration</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="delete_event" handler="hide_window"/>
+
+  <child>
+    <widget class="GtkVBox" id="vbox2">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkNotebook" id="notebook1">
+	  <property name="border_width">4</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox3">
+	      <property name="border_width">2</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">2</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame1">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox4">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="bit16">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">16 bit</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="bit8">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">8 bit</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">bit16</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="xlabel2">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Resolution</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame2">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox5">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="stereo">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Stereo</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="mono">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Mono (downmix)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">stereo</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label3">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Channels</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox14">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame9">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox15">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="resampNearest">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Nearest (fastest)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="resampLinear">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Linear (fast)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">resampNearest</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="resampSpline">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Spline (good quality)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">resampNearest</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="resampPolyphase">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">8-tap Fir (extremely high quality)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">resampNearest</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label4">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Resampling</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame3">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox6">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="samp44">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">44 kHz</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="samp22">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">22 kHz</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">samp44</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="samp11">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">11 kHz</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">False</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">samp44</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label5">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Sampling Rate</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label2">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Quality</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox7">
+	      <property name="border_width">2</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox15">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame5">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox20">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxReverb">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="table1">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">4</property>
+			      <property name="column_spacing">4</property>
+
+			      <child>
+				<widget class="GtkHScale" id="fxReverbDepth">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">30 0 100 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHScale" id="fxReverbDelay">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">90 40 200 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="xlabel3">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Depth</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="xlabel4">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Delay</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label6">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Reverb</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame6">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox21">
+			  <property name="border_width">2</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxBassBoost">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="table2">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">4</property>
+			      <property name="column_spacing">4</property>
+
+			      <child>
+				<widget class="GtkHScale" id="fxBassAmount">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">30 0 100 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHScale" id="fxBassRange">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">30 10 100 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="xlabel5">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Amount</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="xlabel6">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Range</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label7">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Bass Boost</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox16">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame7">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox22">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxSurround">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="table3">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">4</property>
+			      <property name="column_spacing">4</property>
+
+			      <child>
+				<widget class="GtkHScale" id="fxSurroundDepth">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">20 0 100 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHScale" id="fxSurroundDelay">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">20 5 40 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="xlabel7">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Depth</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label8">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Delay</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="xlabel8">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Surround</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame10">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox16">
+			  <property name="border_width">4</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">2</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxPreamp">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox11">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">4</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label19">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Volume</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHScale" id="fxPreampLevel">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">True</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">0 -3 3 1 0 0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label20">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Note:  Setting the preamp
+too high may cause clipping
+(annoying clicks and pops)!</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_CENTER</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label9">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Preamp</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label10">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Effects</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox19">
+	      <property name="border_width">2</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkFrame" id="frame4">
+		  <property name="border_width">2</property>
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox3">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox8">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxUseFilename">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Use Filename as Song Title</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxFastInfo">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Fast Playlist Info</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox9">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxNR">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Noise Reduction</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="fxAmigaMOD">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Play Amiga MOD</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label21">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">General</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="type">label_item</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame11">
+		  <property name="border_width">2</property>
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox17">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkRadioButton" id="fxNoLoop">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Don't loop</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox13">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="fxLoopFinite">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Loop</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">fxNoLoop</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="fxLoopCount">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">1 0 100 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="xlabel21">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">time(s)</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_CENTER</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkRadioButton" id="fxLoopForever">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Loop forever</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <property name="group">fxNoLoop</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label22">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Looping</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="type">label_item</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="xlabel22">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Misc</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHButtonBox" id="hbuttonbox2">
+	  <property name="border_width">4</property>
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+	  <property name="spacing">8</property>
+
+	  <child>
+	    <widget class="GtkButton" id="config_ok">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">OK</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="on_config_ok_clicked"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="config_apply">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Apply</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="on_config_apply_clicked"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="config_cancel">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Cancel</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="on_config_cancel_clicked"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkWindow" id="Info">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">MOD Info</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="delete_event" handler="hide_window"/>
+
+  <child>
+    <widget class="GtkVBox" id="vbox14">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkNotebook" id="notebook2">
+	  <property name="border_width">4</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox9">
+	      <property name="border_width">2</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label11">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Filename:
+Title:
+Type:
+Length:
+Speed:
+Tempo:
+Samples:
+Instruments:
+Patterns:
+Channels:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">4</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="info_general">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">---
+---
+---
+---
+---
+---
+---
+---
+---
+---</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">4</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label13">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">General</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+	      <property name="border_width">6</property>
+	      <property name="visible">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkViewport" id="viewport1">
+		  <property name="visible">True</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="info_samples">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">7.45058015283e-09</property>
+		      <property name="yalign">7.45058015283e-09</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label15">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Samples</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow2">
+	      <property name="border_width">6</property>
+	      <property name="visible">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkViewport" id="viewport2">
+		  <property name="visible">True</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="info_instruments">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">1.49012002737e-08</property>
+		      <property name="yalign">7.45058015283e-09</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label17">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Instruments</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
+	      <property name="visible">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTextView" id="info_message">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">False</property>
+		  <property name="overwrite">False</property>
+		  <property name="accepts_tab">True</property>
+		  <property name="justification">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap_mode">GTK_WRAP_WORD</property>
+		  <property name="cursor_visible">True</property>
+		  <property name="pixels_above_lines">0</property>
+		  <property name="pixels_below_lines">0</property>
+		  <property name="pixels_inside_wrap">0</property>
+		  <property name="left_margin">0</property>
+		  <property name="right_margin">0</property>
+		  <property name="indent">0</property>
+		  <property name="text" translatable="yes"></property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label18">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Message</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">8</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHButtonBox" id="hbuttonbox3">
+	  <property name="border_width">2</property>
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+	  <property name="spacing">30</property>
+
+	  <child>
+	    <widget class="GtkButton" id="info_close">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Close</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="on_info_close_clicked"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/modplug/gui/modplug.gladep	Fri Sep 07 04:04:03 2007 -0500
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
+
+<glade-project>
+  <name>ModPlug</name>
+  <program_name>modplug</program_name>
+  <source_directory>.</source_directory>
+  <pixmaps_directory>.</pixmaps_directory>
+  <gnome_support>FALSE</gnome_support>
+  <use_widget_names>TRUE</use_widget_names>
+  <output_main_file>FALSE</output_main_file>
+  <output_build_files>FALSE</output_build_files>
+  <main_source_file>interface.cxx</main_source_file>
+  <handler_source_file>callbacks.cxx</handler_source_file>
+  <support_source_file>support.cxx</support_source_file>
+</glade-project>
--- a/src/modplug/gui/support.cxx	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/gui/support.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -10,18 +10,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <gtk/gtk.h>
 
 #include "support.h"
 
-/* This is an internally used function to check if a pixmap file exists. */
-static gchar* check_file_exists        (const gchar     *directory,
-                                        const gchar     *filename);
-
-/* This is an internally used function to create pixmaps. */
-static GtkWidget* create_dummy_pixmap  (GtkWidget       *widget);
-
 GtkWidget*
 lookup_widget                          (GtkWidget       *widget,
                                         const gchar     *widget_name)
@@ -34,47 +28,20 @@
         parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
       else
         parent = widget->parent;
+      if (!parent)
+        parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
       if (parent == NULL)
         break;
       widget = parent;
     }
 
-  found_widget = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget),
-                                                   widget_name);
+  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
+                                                 widget_name);
   if (!found_widget)
     g_warning ("Widget not found: %s", widget_name);
   return found_widget;
 }
 
-/* This is a dummy pixmap we use when a pixmap can't be found. */
-static const char *dummy_pixmap_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c None",
-/* pixels */
-" "
-};
-
-/* This is an internally used function to create pixmaps. */
-static GtkWidget*
-create_dummy_pixmap                    (GtkWidget       *widget)
-{
-  GdkColormap *colormap;
-  GdkPixmap *gdkpixmap;
-  GdkBitmap *mask;
-  GtkWidget *pixmap;
-
-  colormap = gtk_widget_get_colormap (widget);
-  gdkpixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mask,
-                                                     NULL, (gchar **)dummy_pixmap_xpm);
-  if (gdkpixmap == NULL)
-    g_error ("Couldn't create replacement pixmap.");
-  pixmap = gtk_pixmap_new (gdkpixmap, mask);
-  gdk_pixmap_unref (gdkpixmap);
-  gdk_bitmap_unref (mask);
-  return pixmap;
-}
-
 static GList *pixmaps_directories = NULL;
 
 /* Use this function to set the directory containing installed pixmaps. */
@@ -85,75 +52,93 @@
                                         g_strdup (directory));
 }
 
+/* This is an internally used function to find pixmap files. */
+static gchar*
+find_pixmap_file                       (const gchar     *filename)
+{
+  GList *elem;
+
+  /* We step through each of the pixmaps directory to find it. */
+  elem = pixmaps_directories;
+  while (elem)
+    {
+      gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data,
+                                         G_DIR_SEPARATOR_S, filename);
+      if (g_file_test (pathname, G_FILE_TEST_EXISTS))
+        return pathname;
+      g_free (pathname);
+      elem = elem->next;
+    }
+  return NULL;
+}
+
 /* This is an internally used function to create pixmaps. */
 GtkWidget*
 create_pixmap                          (GtkWidget       *widget,
                                         const gchar     *filename)
 {
-  gchar *found_filename = NULL;
-  GdkColormap *colormap;
-  GdkPixmap *gdkpixmap;
-  GdkBitmap *mask;
+  gchar *pathname = NULL;
   GtkWidget *pixmap;
-  GList *elem;
+
+  if (!filename || !filename[0])
+      return gtk_image_new ();
 
-  /* We first try any pixmaps directories set by the application. */
-  elem = pixmaps_directories;
-  while (elem)
+  pathname = find_pixmap_file (filename);
+
+  if (!pathname)
     {
-      found_filename = check_file_exists ((gchar*)elem->data, filename);
-      if (found_filename)
-        break;
-      elem = elem->next;
+      g_warning (_("Couldn't find pixmap file: %s"), filename);
+      return gtk_image_new ();
     }
 
-  /* If we haven't found the pixmap, try the source directory. */
-  if (!found_filename)
-    {
-      found_filename = check_file_exists ("../pixmaps", filename);
-    }
-
-  if (!found_filename)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return create_dummy_pixmap (widget);
-    }
-
-  colormap = gtk_widget_get_colormap (widget);
-  gdkpixmap = gdk_pixmap_colormap_create_from_xpm (NULL, colormap, &mask,
-                                                   NULL, found_filename);
-  if (gdkpixmap == NULL)
-    {
-      g_warning (_("Error loading pixmap file: %s"), found_filename);
-      g_free (found_filename);
-      return create_dummy_pixmap (widget);
-    }
-  g_free (found_filename);
-  pixmap = gtk_pixmap_new (gdkpixmap, mask);
-  gdk_pixmap_unref (gdkpixmap);
-  gdk_bitmap_unref (mask);
+  pixmap = gtk_image_new_from_file (pathname);
+  g_free (pathname);
   return pixmap;
 }
 
-/* This is an internally used function to check if a pixmap file exists. */
-gchar*
-check_file_exists                      (const gchar     *directory,
-                                        const gchar     *filename)
+/* This is an internally used function to create pixmaps. */
+GdkPixbuf*
+create_pixbuf                          (const gchar     *filename)
 {
-  gchar *full_filename;
-  struct stat s;
-  gint status;
+  gchar *pathname = NULL;
+  GdkPixbuf *pixbuf;
+  GError *error = NULL;
+
+  if (!filename || !filename[0])
+      return NULL;
+
+  pathname = find_pixmap_file (filename);
 
-  full_filename = (gchar*) g_malloc (strlen (directory) + 1
-                                     + strlen (filename) + 1);
-  strcpy (full_filename, directory);
-  strcat (full_filename, G_DIR_SEPARATOR_S);
-  strcat (full_filename, filename);
+  if (!pathname)
+    {
+      g_warning (_("Couldn't find pixmap file: %s"), filename);
+      return NULL;
+    }
 
-  status = stat (full_filename, &s);
-  if (status == 0 && S_ISREG (s.st_mode))
-    return full_filename;
-  g_free (full_filename);
-  return NULL;
+  pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
+  if (!pixbuf)
+    {
+      fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
+               pathname, error->message);
+      g_error_free (error);
+    }
+  g_free (pathname);
+  return pixbuf;
 }
 
+/* This is used to set ATK action descriptions. */
+void
+glade_set_atk_action_description       (AtkAction       *action,
+                                        const gchar     *action_name,
+                                        const gchar     *description)
+{
+  gint n_actions, i;
+
+  n_actions = atk_action_get_n_actions (action);
+  for (i = 0; i < n_actions; i++)
+    {
+      if (!strcmp (atk_action_get_name (action, i), action_name))
+        atk_action_set_description (action, i, description);
+    }
+}
+
--- a/src/modplug/gui/support.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/gui/support.h	Fri Sep 07 04:04:03 2007 -0500
@@ -11,10 +11,11 @@
 /*
  * Standard gettext macros.
  */
-#if defined ENABLE_NLS && !defined __NetBSD__
+#ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
 #  define _(String) dgettext (PACKAGE, String)
+#  define Q_(String) g_strip_context ((String), gettext (String))
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else
@@ -27,6 +28,7 @@
 #  define dcgettext(Domain,Message,Type) (Message)
 #  define bindtextdomain(Domain,Directory) (Domain)
 #  define _(String) (String)
+#  define Q_(String) g_strip_context ((String), (String))
 #  define N_(String) (String)
 #endif
 
@@ -44,8 +46,6 @@
 GtkWidget*  lookup_widget              (GtkWidget       *widget,
                                         const gchar     *widget_name);
 
-/* get_widget() is deprecated. Use lookup_widget instead. */
-#define get_widget lookup_widget
 
 /* Use this function to set the directory containing installed pixmaps. */
 void        add_pixmap_directory       (const gchar     *directory);
@@ -55,7 +55,15 @@
  * Private Functions.
  */
 
-/* This is used to create the pixmaps in the interface. */
+/* This is used to create the pixmaps used in the interface. */
 GtkWidget*  create_pixmap              (GtkWidget       *widget,
                                         const gchar     *filename);
 
+/* This is used to create the pixbufs used in the interface. */
+GdkPixbuf*  create_pixbuf              (const gchar     *filename);
+
+/* This is used to set ATK action descriptions. */
+void        glade_set_atk_action_description (AtkAction       *action,
+                                              const gchar     *action_name,
+                                              const gchar     *description);
+
--- a/src/modplug/modplugbmp.cxx	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/modplugbmp.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -19,6 +19,7 @@
 #include "audacious/tuple.h"
 #include "audacious/tuple_formatter.h"
 #include "audacious/vfs.h"
+#include "audacious/strings.h"
 }
 
 static char* format_and_free_ti( Tuple* ti, int* length )
@@ -110,13 +111,13 @@
 {
 	string lExt;
 	uint32 lPos;
+	const int magicSize = 32;
+	char magic[magicSize];
 
-	gchar magic[4];
-
-	vfs_fread(magic, 1, 4, file);
+	vfs_fread(magic, 1, magicSize, file);
 	if (!memcmp(magic, UMX_MAGIC, 4))
 		return true;
-	if (!memcmp(magic, XM_MAGIC, 4))
+	if (!memcmp(magic, "Extended Module:", 16))
 		return true;
 	if (!memcmp(magic, M669_MAGIC, 2))
 		return true;
@@ -131,12 +132,22 @@
 	vfs_fread(magic, 1, 4, file);
 	if (!memcmp(magic, S3M_MAGIC, 4))
 		return true;
+
 	vfs_fseek(file, 1080, SEEK_SET);
 	vfs_fread(magic, 1, 4, file);
-	if (!memcmp(magic, MOD_MAGIC_FASTTRACKER6, 4))
-		return true;
-	if (!memcmp(magic, MOD_MAGIC_FASTTRACKER8, 4))
-		return true;
+	
+	// Check for Fast Tracker multichannel modules (xCHN, xxCH)
+	if (magic[1] == 'C' && magic[2] == 'H' && magic[3] == 'N') {
+		if (magic[0] == '6' || magic[0] == '8')
+			return true;
+	}
+	if (magic[2] == 'C' && magic[3] == 'H' && isdigit(magic[0]) && isdigit(magic[1])) {
+		int nch = (magic[0] - '0') * 10 + (magic[1] - '0');
+		if ((nch % 2 == 0) && nch >= 10)
+			return true;
+	}
+	
+	// Check for Amiga MOD module formats
 	if(mModProps.mGrabAmigaMOD) {
 	if (!memcmp(magic, MOD_MAGIC_PROTRACKER4, 4))
 		return true;
@@ -491,20 +502,11 @@
 	return (float32)mOutPlug->output_time() / 1000;
 }
 
-void ModplugXMMS::GetSongInfo(const string& aFilename, char*& aTitle, int32& aLength)
-{
-	aLength = -1;
-        *aTitle = NULL;
-
-        Tuple* ti = GetSongTuple( aFilename );
-        if ( ti )
-                aTitle = format_and_free_ti( ti, &aLength );
-}
-
 Tuple* ModplugXMMS::GetSongTuple(const string& aFilename)
 {
 	CSoundFile* lSoundFile;
 	Archive* lArchive;
+	gchar* tmps;
 	
 	//open and mmap the file
         lArchive = OpenArchive(aFilename);
@@ -517,78 +519,44 @@
 	Tuple *ti = tuple_new_from_filename(aFilename.c_str());
 	lSoundFile = new CSoundFile;
 	lSoundFile->Create((uchar*)lArchive->Map(), lArchive->Size());
+
 	switch(lSoundFile->GetType())
         {
-	case MOD_TYPE_MOD:
-		tuple_associate_string(ti, "codec", "ProTracker");
-		break;
-	case MOD_TYPE_S3M:
-		tuple_associate_string(ti, "codec", "Scream Tracker 3");
-		break;
-	case MOD_TYPE_XM:
-		tuple_associate_string(ti, "codec", "Fast Tracker 2");
-		break;
-	case MOD_TYPE_IT:
-		tuple_associate_string(ti, "codec", "Impulse Tracker");
-		break;
-	case MOD_TYPE_MED:
-		tuple_associate_string(ti, "codec", "OctaMed");
-		break;
-	case MOD_TYPE_MTM:
-		tuple_associate_string(ti, "codec", "MTM");
-		break;
-	case MOD_TYPE_669:
-		tuple_associate_string(ti, "codec", "669 Composer / UNIS 669");
-		break;
-	case MOD_TYPE_ULT:
-		tuple_associate_string(ti, "codec", "ULT");
-		break;
-	case MOD_TYPE_STM:
-		tuple_associate_string(ti, "codec", "Scream Tracker");
-		break;
-	case MOD_TYPE_FAR:
-		tuple_associate_string(ti, "codec", "Farandole");
-		break;
-	case MOD_TYPE_AMF:
-		tuple_associate_string(ti, "codec", "ASYLUM Music Format");
-		break;
-	case MOD_TYPE_AMS:
-		tuple_associate_string(ti, "codec", "AMS module");
-		break;
-	case MOD_TYPE_DSM:
-		tuple_associate_string(ti, "codec", "DSIK Internal Format");
-		break;
-	case MOD_TYPE_MDL:
-		tuple_associate_string(ti, "codec", "DigiTracker");
-		break;
-	case MOD_TYPE_OKT:
-		tuple_associate_string(ti, "codec", "Oktalyzer");
-		break;
-	case MOD_TYPE_DMF:
-		tuple_associate_string(ti, "codec", "Delusion Digital Music Fileformat (X-Tracker)");
-		break;
-	case MOD_TYPE_PTM:
-		tuple_associate_string(ti, "codec", "PolyTracker");
-		break;
-	case MOD_TYPE_DBM:
-		tuple_associate_string(ti, "codec", "DigiBooster Pro");
-		break;
-	case MOD_TYPE_MT2:
-		tuple_associate_string(ti, "codec", "MT2");
-		break;
-	case MOD_TYPE_AMF0:
-		tuple_associate_string(ti, "codec", "AMF0");
-		break;
-	case MOD_TYPE_PSM:
-		tuple_associate_string(ti, "codec", "PSM");
-		break;
-	default:
-		tuple_associate_string(ti, "codec", "ModPlug unknown");
-		break;
+	case MOD_TYPE_MOD:	tmps = "ProTracker"; break;
+	case MOD_TYPE_S3M:	tmps = "Scream Tracker 3"; break;
+	case MOD_TYPE_XM:	tmps = "Fast Tracker 2"; break;
+	case MOD_TYPE_IT:	tmps = "Impulse Tracker"; break;
+	case MOD_TYPE_MED:	tmps = "OctaMed"; break;
+	case MOD_TYPE_MTM:	tmps = "MultiTracker Module"; break;
+	case MOD_TYPE_669:	tmps = "669 Composer / UNIS 669"; break;
+	case MOD_TYPE_ULT:	tmps = "Ultra Tracker"; break;
+	case MOD_TYPE_STM:	tmps = "Scream Tracker"; break;
+	case MOD_TYPE_FAR:	tmps = "Farandole"; break;
+	case MOD_TYPE_AMF:	tmps = "ASYLUM Music Format"; break;
+	case MOD_TYPE_AMS:	tmps = "AMS module"; break;
+	case MOD_TYPE_DSM:	tmps = "DSIK Internal Format"; break;
+	case MOD_TYPE_MDL:	tmps = "DigiTracker"; break;
+	case MOD_TYPE_OKT:	tmps = "Oktalyzer"; break;
+	case MOD_TYPE_DMF:	tmps = "Delusion Digital Music Fileformat (X-Tracker)"; break;
+	case MOD_TYPE_PTM:	tmps = "PolyTracker"; break;
+	case MOD_TYPE_DBM:	tmps = "DigiBooster Pro"; break;
+	case MOD_TYPE_MT2:	tmps = "MadTracker 2"; break;
+	case MOD_TYPE_AMF0:	tmps = "AMF0"; break;
+	case MOD_TYPE_PSM:	tmps = "Protracker Studio Module"; break;
+	default:		tmps = "ModPlug unknown"; break;
 	}
+	tuple_associate_string(ti, "codec", tmps);
 	tuple_associate_string(ti, "quality", "sequenced");
-	tuple_associate_string(ti, "title", lSoundFile->GetTitle());
 	tuple_associate_int(ti, "length", 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.
+	 */
+	tmps = str_to_utf8(lSoundFile->GetTitle());
+	tuple_associate_string(ti, "title", tmps);
+	g_free(tmps);
+	
 	
 	//unload the file
 	lSoundFile->Destroy();
--- a/src/modplug/modplugbmp.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/modplugbmp.h	Fri Sep 07 04:04:03 2007 -0500
@@ -29,8 +29,6 @@
 #define MOD_MAGIC_STARTRACKER4X	(unsigned char [4]) { 0x45, 0x58, 0x30, 0x34 }  // "EX04" - Startracker 4 channel (Startrekker/AudioSculpture)
 #define MOD_MAGIC_STARTRACKER8X	(unsigned char [4]) { 0x45, 0x58, 0x30, 0x38 }  // "EX08" - Startracker 8 channel (Startrekker/AudioSculpture) 
 #define MOD_MAGIC_FASTTRACKER4	(unsigned char [4]) { 0x34, 0x43, 0x48, 0x4E }  // "4CHN" - Fasttracker 4 channel
-#define MOD_MAGIC_FASTTRACKER6	(unsigned char [4]) { 0x36, 0x43, 0x48, 0x4E }  // "6CHN" - Fasttracker 6 channel
-#define MOD_MAGIC_FASTTRACKER8	(unsigned char [4]) { 0x38, 0x43, 0x48, 0x4E }  // "8CHN" - Fasttracker 8 channel
 #define MOD_MAGIC_OKTALYZER8	(unsigned char [4]) { 0x43, 0x44, 0x38, 0x31 }  // "CD81" - Atari oktalyzer 8 channel
 #define MOD_MAGIC_OKTALYZER8X	(unsigned char [4]) { 0x4F, 0x4B, 0x54, 0x41 }  // "OKTA" - Atari oktalyzer 8 channel
 #define MOD_MAGIC_TAKETRACKER16	(unsigned char [4]) { 0x31, 0x36, 0x43, 0x4E }  // "16CN" - Taketracker 16 channel
@@ -99,7 +97,6 @@
 	void Seek(float32 aTime);                // Seek to the specified time.
 	float32 GetTime();                   // Get the current play time.
 
-	void GetSongInfo(const string& aFilename, char*& aTitle, int32& aLength); // Function to grab the title string
 	Tuple* GetSongTuple(const string& aFilename);
 
 	void SetInputPlugin(InputPlugin& aInPlugin);
--- a/src/modplug/plugin.cxx	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/modplug/plugin.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -60,11 +60,6 @@
 		return (int)(lTime * 1000);
 }
 
-static void GetSongInfo(char* aFilename, char** aTitle, int* aLength)
-{
-	gModplugXMMS.GetSongInfo(aFilename, *aTitle, *aLength);
-}
-
 static Tuple* GetSongTuple(char* aFilename)
 {
 	return gModplugXMMS.GetSongTuple(aFilename);
@@ -113,7 +108,7 @@
 	NULL,
 	NULL,
 	NULL,
-	GetSongInfo,
+	NULL,
 	ShowFileInfoBox,
 	NULL,	// output
 	GetSongTuple,
--- a/src/sexypsf/PsxCounters.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/PsxCounters.c	Fri Sep 07 04:04:03 2007 -0500
@@ -20,6 +20,10 @@
 
 #include "PsxCommon.h"
 
+psxCounter psxCounters[5];
+
+u32 psxNextCounter, psxNextsCounter;
+
 static int cnts = 4;
 static u32 last=0;
 
--- a/src/sexypsf/PsxCounters.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/PsxCounters.h	Fri Sep 07 04:04:03 2007 -0500
@@ -24,9 +24,9 @@
 	u32 sCycle, Cycle, rate, interrupt;
 } psxCounter;
 
-psxCounter psxCounters[5];
+extern psxCounter psxCounters[5];
 
-u32 psxNextCounter, psxNextsCounter;
+extern u32 psxNextCounter, psxNextsCounter;
 
 void psxRcntInit();
 void psxRcntUpdate();
--- a/src/sexypsf/PsxMem.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/PsxMem.c	Fri Sep 07 04:04:03 2007 -0500
@@ -21,6 +21,15 @@
 
 #include "PsxCommon.h"
 
+char *psxM;
+  
+char *psxP;
+char *psxR;
+   
+char *psxH;
+
+char **psxMemLUT;
+
 void LoadPSXMem(u32 address, s32 length, unsigned char *data)
 {
  //printf("%08x %08x\n",address,length);
--- a/src/sexypsf/PsxMem.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/PsxMem.h	Fri Sep 07 04:04:03 2007 -0500
@@ -49,21 +49,21 @@
 static INLINE s16 BFLIP16S(s16 x)
 { return (s16)BFLIP16((u16)x); }
 
-char *psxM;
+extern char *psxM;
 #define psxMu32(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
 
-char *psxP;
-char *psxR;
+extern char *psxP;
+extern char *psxR;
 #define psxRu32(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
 
-char *psxH;
+extern char *psxH;
 
 #define psxHu8(mem)	(*(u8*) &psxH[(mem) & 0xffff])
 
 #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
 #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
 
-char **psxMemLUT;
+extern char **psxMemLUT;
 
 #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
 
--- a/src/sexypsf/R3000A.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/R3000A.c	Fri Sep 07 04:04:03 2007 -0500
@@ -22,6 +22,9 @@
 
 #include "PsxCommon.h"
 
+psxRegisters psxRegs;
+R3000Acpu *psxCpu;
+
 int psxInit() {
 
 	psxCpu = &psxInt;
--- a/src/sexypsf/R3000A.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/R3000A.h	Fri Sep 07 04:04:03 2007 -0500
@@ -32,7 +32,7 @@
 	void (*Shutdown)();
 } R3000Acpu;
 
-R3000Acpu *psxCpu;
+extern R3000Acpu *psxCpu;
 extern R3000Acpu psxInt;
 
 typedef union {
@@ -68,7 +68,7 @@
 	u32 interrupt;
 } psxRegisters;
 
-psxRegisters psxRegs;
+extern psxRegisters psxRegs;
 
 #define _i32(x) (s32)x
 #define _u32(x) (u32)x
--- a/src/sexypsf/plugin.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sexypsf/plugin.c	Fri Sep 07 04:04:03 2007 -0500
@@ -123,7 +123,6 @@
 
     playback->output->close_audio();
     if (!(stop)) nextsong = TRUE;
-    g_thread_exit(NULL);
     return NULL;
 }
 
--- a/src/sid/Makefile	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/Makefile	Fri Sep 07 04:04:03 2007 -0500
@@ -30,12 +30,12 @@
 	xs_glade.c	\
 	xs_interface.c	\
 	xs_stil.c	\
-	xs_title.c	\
 	xs_fileinfo.c	\
 	xs_filter.c	\
 	xs_sidplay1.cc	\
 	xs_sidplay2.cc	\
 	xs_curve.c	\
+	xs_slsup.c	\
 	xmms-sid.c
 
 OBJECTS1 = ${SOURCES:.c=.o}
--- a/src/sid/xmms-sid.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xmms-sid.c	Fri Sep 07 04:04:03 2007 -0500
@@ -28,17 +28,18 @@
 
 #include <stdarg.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
 
 #include "xs_config.h"
 #include "xs_length.h"
 #include "xs_stil.h"
-#include "xs_title.h"
 #include "xs_filter.h"
 #include "xs_fileinfo.h"
 #include "xs_interface.h"
 #include "xs_glade.h"
 #include "xs_player.h"
+#include "xs_slsup.h"
+#include "audacious/playlist.h"
+
 
 /*
  * Include player engines
@@ -87,20 +88,7 @@
 XS_MUTEX(xs_status);
 static XS_THREAD_T xs_decode_thread;
 
-static GtkWidget *xs_subctrl = NULL;
-static GtkObject *xs_subctrl_adj = NULL;
-XS_MUTEX(xs_subctrl);
-
-void		xs_subctrl_close(void);
-void		xs_subctrl_update(void);
-
-static t_xs_sldb *xs_sldb_db = NULL;
-XS_MUTEX(xs_sldb_db);
-
-gint		xs_songlen_init(void);
-void		xs_songlen_close(void);
-t_xs_sldb_node *xs_songlen_get(const gchar *);
-
+void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune);
 
 /*
  * Error messages
@@ -108,7 +96,7 @@
 void xs_error(const char *fmt, ...)
 {
 	va_list ap;
-	fprintf(stderr, "XMMS-SID: ");
+	fprintf(stderr, "AUD-SID: ");
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
@@ -136,6 +124,8 @@
 	gint iPlayer;
 	gboolean isInitialized;
 
+	XSDEBUG("xs_reinit() thread = %p\n", g_thread_self());
+
 	/* Stop playing, if we are */
 	XS_MUTEX_LOCK(xs_status);
 	if (xs_status.isPlaying) {
@@ -231,7 +221,6 @@
 	XSDEBUG("xs_init()\n");
 
 	/* Initialize and get configuration */
-	xs_memset(&xs_cfg, 0, sizeof(xs_cfg));
 	xs_init_configuration();
 	xs_read_configuration();
 
@@ -269,269 +258,285 @@
  */
 gint xs_is_our_file(gchar *pcFilename)
 {
+	gint result = 0;
 	t_xs_file *f;
 	assert(xs_status.sidPlayer);
 
 	/* Check the filename */
 	if (pcFilename == NULL)
-		return FALSE;
+		return 0;
 
+//	XS_MUTEX_LOCK(xs_status);
 	if ((f = xs_fopen(pcFilename, "rb")) != NULL) {
 		if (xs_status.sidPlayer->plrProbe(f))
-			return TRUE;
+			result = 1;
 		xs_fclose(f);
 	}
 
-	return FALSE;
+//	XS_MUTEX_UNLOCK(xs_status);
+	return result;
+}
+
+static gchar * xs_has_tracknumber(gchar *pcFilename)
+{
+	gchar *tmpSep = xs_strrchr(pcFilename, '?');
+	if (tmpSep && g_ascii_isdigit(*(tmpSep + 1)))
+		return tmpSep;
+	else
+		return NULL;
+}
+
+gboolean xs_get_trackinfo(const gchar *pcFilename, gchar **pcResult, gint *pTrack)
+{
+	gchar *tmpSep;
+
+	*pcResult = g_strdup(pcFilename);
+	tmpSep = xs_has_tracknumber(*pcResult);
+
+	if (tmpSep) {
+		*tmpSep = '\0';
+		*pTrack = atoi(tmpSep + 1);
+		return TRUE;
+	} else {
+		*pTrack = -1;
+		return FALSE;
+	}
 }
 
 
 gint xs_is_our_file_vfs(gchar *pcFilename, t_xs_file *f)
 {
+	gint tmpResult = 0, tmpDummy = 0;
 	assert(xs_status.sidPlayer);
 
 	/* Check the filename */
 	if (pcFilename == NULL)
-		return FALSE;
-
-	return xs_status.sidPlayer->plrProbe(f);
-}
-
+		return 0;
+	
+	if (xs_has_tracknumber(pcFilename) != NULL)
+		return 1;
+	
+	if (xs_status.sidPlayer->plrProbe(f)) {
+		t_xs_tuneinfo *pInfo;
+		
+		pInfo = xs_status.sidPlayer->plrGetSIDInfo(pcFilename);
+		
+		if (pInfo->nsubTunes > 1) {
+			gint i;
+			for (i = 1; i <= pInfo->nsubTunes; i++) {
+				gchar *tmpStr = g_strdup_printf("%s?%d", pcFilename, i);
+				gboolean doAdd = FALSE;
+					
+				if (xs_cfg.subAutoMinOnly) {
+					if (i == pInfo->startTune ||
+						pInfo->subTunes[i - 1].tuneLength >= xs_cfg.subAutoMinTime)
+						doAdd = TRUE;
+				} else
+					doAdd = TRUE;
+					
+				if (doAdd)
+					playlist_add_url(playlist_get_active(), tmpStr);
 
-static gboolean xs_schedule_subctrl_update(gpointer unused)
-{
-	(void) unused;
-	gboolean isPlaying;
-	
-	XS_MUTEX_LOCK(xs_status);
-	isPlaying = xs_status.isPlaying;
-	XS_MUTEX_UNLOCK(xs_status);
+				g_free(tmpStr);
+			}
 
-	if (isPlaying)
-		xs_subctrl_update();
-
-	return FALSE;
+			tmpResult = -1;
+		} else
+			tmpResult = 1;
+			
+		xs_tuneinfo_free(pInfo);
+	}
+		
+	return tmpResult;
 }
 
 
 /*
- * Main playing thread loop
+ * Start playing the given file
  */
-void *xs_playthread(void *argPointer)
+void xs_play_file(InputPlayback *pb)
 {
-	InputPlayback *pb = argPointer;
-	t_xs_status myStatus;
-	t_xs_tuneinfo *myTune;
-	gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
-	gint audioGot, songLength, i;
-	gchar *audioBuffer = NULL, *oversampleBuffer = NULL, *tmpTitle;
+	t_xs_tuneinfo *tmpTune;
+	gboolean audioOpen = FALSE;
+	gint audioGot, tmpLength, i, subTune;
+	gchar *tmpFilename, *audioBuffer = NULL, *oversampleBuffer = NULL, *tmpTitle;
+	Tuple *tmpTuple;
+
+	assert(pb);
+	assert(xs_status.sidPlayer);
+	
+	XSDEBUG("play '%s'\n", pb->filename);
+
+	XS_MUTEX_LOCK(xs_status);
+
+	/* Get tune information */
+	xs_get_trackinfo(pb->filename, &tmpFilename, &subTune);
+	if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename)) == NULL) {
+		XS_MUTEX_UNLOCK(xs_status);
+		g_free(tmpFilename);
+		return;
+	}
 
-	(void) argPointer;
+	/* Initialize the tune */
+	if (!xs_status.sidPlayer->plrLoadSID(&xs_status, tmpFilename)) {
+		XS_MUTEX_UNLOCK(xs_status);
+		g_free(tmpFilename);
+		xs_tuneinfo_free(xs_status.tuneInfo);
+		xs_status.tuneInfo = NULL;
+		return;
+	}
+	
+	g_free(tmpFilename);
+	tmpFilename = NULL;
+
+	XSDEBUG("load ok\n");
 
-	/* Initialize */
-	XSDEBUG("entering player thread\n");
-	XS_MUTEX_LOCK(xs_status);
-	memcpy(&myStatus, &xs_status, sizeof(t_xs_status));
-	myTune = xs_status.tuneInfo;
-	for (i = 0; i <= myTune->nsubTunes; i++)
-		myTune->subTunes[i].tunePlayed = FALSE;
-	XS_MUTEX_UNLOCK(xs_status);
+	/* Set general status information */
+	xs_status.isPlaying = TRUE;
+	xs_status.isError = FALSE;
+	tmpTune = xs_status.tuneInfo;
+
+	if (subTune < 1 || subTune > xs_status.tuneInfo->nsubTunes)
+		xs_status.currSong = xs_status.tuneInfo->startTune;
+	else
+		xs_status.currSong = subTune;
+
+	XSDEBUG("subtune #%i selected (#%d wanted), initializing...\n", xs_status.currSong, subTune);
+
+
+	/* We are ready */
+	xs_decode_thread = g_thread_self();
+	XSDEBUG("playing thread = %p\n", xs_decode_thread);
+	pb->set_pb_ready(pb);
+
 
 	/* Allocate audio buffer */
 	audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
 	if (audioBuffer == NULL) {
 		xs_error(_("Couldn't allocate memory for audio data buffer!\n"));
+		XS_MUTEX_UNLOCK(xs_status);
 		goto xs_err_exit;
 	}
-
-	if (myStatus.oversampleEnable) {
-		oversampleBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE * myStatus.oversampleFactor);
+	
+	if (xs_status.oversampleEnable) {
+		oversampleBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE * xs_status.oversampleFactor);
 		if (oversampleBuffer == NULL) {
 			xs_error(_("Couldn't allocate memory for audio oversampling buffer!\n"));
+			XS_MUTEX_UNLOCK(xs_status);
 			goto xs_err_exit;
 		}
 	}
 
-	/*
-	 * Main player loop: while not stopped, loop here - play subtunes
-	 */
-	audioOpen = FALSE;
-	doPlay = TRUE;
-	while (xs_status.isPlaying && doPlay) {
-		/* Automatic sub-tune change logic */
-		XS_MUTEX_LOCK(xs_cfg);
-		XS_MUTEX_LOCK(xs_status);
-		myStatus.isPlaying = TRUE;
+
+	/* Check minimum playtime */
+	tmpLength = tmpTune->subTunes[xs_status.currSong - 1].tuneLength;
+	if (xs_cfg.playMinTimeEnable && (tmpLength >= 0)) {
+		if (tmpLength < xs_cfg.playMinTime)
+			tmpLength = xs_cfg.playMinTime;
+	}
+
+	/* Initialize song */
+	if (!xs_status.sidPlayer->plrInitSong(&xs_status)) {
+		xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
+		      tmpTune->sidFilename, xs_status.currSong);
+		XS_MUTEX_UNLOCK(xs_status);
+		goto xs_err_exit;
+	}
 		
-		if (xs_status.currSong < 1 || myStatus.currSong < 1) {
-			XS_MUTEX_UNLOCK(xs_status);
-			XS_MUTEX_UNLOCK(xs_cfg);
-			goto xs_err_exit;
-		}
+	/* Open the audio output */
+	XSDEBUG("open audio output (%d, %d, %d)\n",
+		xs_status.audioFormat, xs_status.audioFrequency, xs_status.audioChannels);
 		
-		if (xs_cfg.subAutoEnable && (myStatus.currSong == xs_status.currSong)) {
-			/* Check if currently selected sub-tune has been played already */
-			if (myTune->subTunes[myStatus.currSong-1].tunePlayed) {
-				/* Find a tune that has not been played */
-				XSDEBUG("tune #%i already played, finding next match ...\n", myStatus.currSong);
-				isFound = FALSE;
-				i = 0;
-				while (!isFound && (++i <= myTune->nsubTunes)) {
-					if (xs_cfg.subAutoMinOnly) {
-						/* A tune with minimum length must be found */
-						if (!myTune->subTunes[i-1].tunePlayed &&
-							myTune->subTunes[i-1].tuneLength >= xs_cfg.subAutoMinTime)
-							isFound = TRUE;
-					} else {
-						/* Any unplayed tune is okay */
-						if (!myTune->subTunes[i-1].tunePlayed)
-							isFound = TRUE;
-					}
-				}
+	if (!pb->output->open_audio(xs_status.audioFormat, xs_status.audioFrequency, xs_status.audioChannels)) {
+		xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
+			xs_status.audioFormat,
+			xs_status.audioFrequency,
+			xs_status.audioChannels);
+
+		xs_status.isError = TRUE;
+		XS_MUTEX_UNLOCK(xs_status);
+		goto xs_err_exit;
+	}
+
+	audioOpen = TRUE;
+
+	/* Set song information for current subtune */
+	XSDEBUG("foobar #1\n");
+	xs_status.sidPlayer->plrUpdateSIDInfo(&xs_status);
+	XS_MUTEX_UNLOCK(xs_status);
+	tmpTuple = tuple_new_from_filename(tmpTune->sidFilename);
+	xs_get_song_tuple_info(tmpTuple, tmpTune, xs_status.currSong);
 
-				if (isFound) {
-					/* Set the new sub-tune */
-					XSDEBUG("found #%i\n", i);
-					xs_status.currSong = i;
-				} else
-					/* This is the end */
-					doPlay = FALSE;
+	tmpTitle = tuple_formatter_process_string(tmpTuple,
+		xs_cfg.titleOverride ? xs_cfg.titleFormat : get_gentitle_format());
+	
+	XSDEBUG("foobar #4\n");
+	XS_MUTEX_LOCK(xs_status);
+	xs_plugin_ip.set_info(
+		tmpTitle,
+		(tmpLength > 0) ? (tmpLength * 1000) : 0,
+		-1,
+		xs_status.audioFrequency,
+		xs_status.audioChannels);
+		
+	g_free(tmpTitle);
+	
+	XS_MUTEX_UNLOCK(xs_status);
+	XSDEBUG("playing\n");
+	while (xs_status.isPlaying) {
+		/* Render audio data */
+		XS_MUTEX_LOCK(xs_status);
+		if (xs_status.oversampleEnable) {
+			/* Perform oversampled rendering */
+			audioGot = xs_status.sidPlayer->plrFillBuffer(
+				&xs_status,
+				oversampleBuffer,
+				(XS_AUDIOBUF_SIZE * xs_status.oversampleFactor));
+
+			audioGot /= xs_status.oversampleFactor;
 
+			/* Execute rate-conversion with filtering */
+			if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
+				xs_status.audioFormat, xs_status.oversampleFactor, audioGot) < 0) {
+				xs_error(_("Oversampling rate-conversion pass failed.\n"));
+				xs_status.isError = TRUE;
 				XS_MUTEX_UNLOCK(xs_status);
-				XS_MUTEX_UNLOCK(xs_cfg);
-				continue;	/* This is ugly, but ... */
+				goto xs_err_exit;
+			}
+		} else {
+			audioGot = xs_status.sidPlayer->plrFillBuffer(
+				&xs_status, audioBuffer, XS_AUDIOBUF_SIZE);
+		}
+
+		/* I <3 visualice/haujobb */
+		produce_audio(pb->output->written_time(),
+			xs_status.audioFormat, xs_status.audioChannels,
+			audioGot, audioBuffer, NULL);
+		
+		XS_MUTEX_UNLOCK(xs_status);
+
+		/* Wait a little */
+		while (xs_status.isPlaying && (pb->output->buffer_free() < audioGot))
+			xmms_usleep(500);
+
+		/* Check if we have played enough */
+		XS_MUTEX_LOCK(xs_status);
+		if (xs_cfg.playMaxTimeEnable) {
+			if (xs_cfg.playMaxTimeUnknown) {
+				if ((tmpLength < 0) &&
+					(pb->output->output_time() >= (xs_cfg.playMaxTime * 1000)))
+					xs_status.isPlaying = FALSE;
+			} else {
+				if (pb->output->output_time() >= (xs_cfg.playMaxTime * 1000))
+					xs_status.isPlaying = FALSE;
 			}
 		}
 
-		/* Tell that we are initializing, update sub-tune controls */
-		myStatus.currSong = xs_status.currSong;
-		myTune->subTunes[myStatus.currSong-1].tunePlayed = TRUE;
-		XS_MUTEX_UNLOCK(xs_status);
-		XS_MUTEX_UNLOCK(xs_cfg);
-
-		XSDEBUG("subtune #%i selected, initializing...\n", myStatus.currSong);
-
-		g_idle_add_full( G_PRIORITY_HIGH_IDLE , xs_schedule_subctrl_update , NULL , NULL );
-
-		/* Check minimum playtime */
-		songLength = myTune->subTunes[myStatus.currSong-1].tuneLength;
-		if (xs_cfg.playMinTimeEnable && (songLength >= 0)) {
-			if (songLength < xs_cfg.playMinTime)
-				songLength = xs_cfg.playMinTime;
-		}
-
-		/* Initialize song */
-		if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
-			xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
-			      myTune->sidFilename, myStatus.currSong);
-			goto xs_err_exit;
-		}
-		
-		/* Open the audio output */
-		XSDEBUG("open audio output (%d, %d, %d)\n",
-			myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels);
-		
-		if (!pb->output->
-			open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels)) {
-			xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
-				myStatus.audioFormat,
-				myStatus.audioFrequency,
-				myStatus.audioChannels);
-
-			XS_MUTEX_LOCK(xs_status);
-			xs_status.isError = TRUE;
-			XS_MUTEX_UNLOCK(xs_status);
-			goto xs_err_exit;
+		if (tmpLength >= 0) {
+			if (pb->output->output_time() >= (tmpLength * 1000))
+				xs_status.isPlaying = FALSE;
 		}
-
-		audioOpen = TRUE;
-
-		/* Set song information for current subtune */
-		XSDEBUG("set tune info\n");
-		myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);
-		tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
-		
-		xs_plugin_ip.set_info(
-			tmpTitle,
-			(songLength > 0) ? (songLength * 1000) : 0,
-			-1,
-			myStatus.audioFrequency,
-			myStatus.audioChannels);
-		
-		g_free(tmpTitle);
-		
-		XSDEBUG("playing\n");
-
-		/*
-		 * Play the subtune
-		 */
-		while (xs_status.isPlaying && myStatus.isPlaying && (xs_status.currSong == myStatus.currSong)) {
-			/* Render audio data */
-			if (myStatus.oversampleEnable) {
-				/* Perform oversampled rendering */
-				audioGot = myStatus.sidPlayer->plrFillBuffer(
-					&myStatus,
-					oversampleBuffer,
-					(XS_AUDIOBUF_SIZE * myStatus.oversampleFactor));
-
-				audioGot /= myStatus.oversampleFactor;
-
-				/* Execute rate-conversion with filtering */
-				if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
-					myStatus.audioFormat, myStatus.oversampleFactor, audioGot) < 0) {
-					xs_error(_("Oversampling rate-conversion pass failed.\n"));
-					XS_MUTEX_LOCK(xs_status);
-					xs_status.isError = TRUE;
-					XS_MUTEX_UNLOCK(xs_status);
-					goto xs_err_exit;
-				}
-			} else {
-				audioGot = myStatus.sidPlayer->plrFillBuffer(
-					&myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
-			}
-
-			/* I <3 visualice/haujobb */
-			produce_audio(pb->output->written_time(),
-				myStatus.audioFormat, myStatus.audioChannels,
-				audioGot, audioBuffer, NULL);
-
-			/* Wait a little */
-			while (xs_status.isPlaying &&
-				(xs_status.currSong == myStatus.currSong) &&
-				(pb->output->buffer_free() < audioGot))
-				xmms_usleep(500);
-
-			/* Check if we have played enough */
-			if (xs_cfg.playMaxTimeEnable) {
-				if (xs_cfg.playMaxTimeUnknown) {
-					if ((songLength < 0) &&
-						(pb->output->output_time() >= (xs_cfg.playMaxTime * 1000)))
-						myStatus.isPlaying = FALSE;
-				} else {
-					if (pb->output->output_time() >= (xs_cfg.playMaxTime * 1000))
-						myStatus.isPlaying = FALSE;
-				}
-			}
-
-			if (songLength >= 0) {
-				if (pb->output->output_time() >= (songLength * 1000))
-					myStatus.isPlaying = FALSE;
-			}
-		}
-
-		XSDEBUG("subtune ended/stopped\n");
-
-		/* Close audio output plugin */
-		if (audioOpen) {
-			XSDEBUG("close audio #1\n");
-			pb->output->close_audio();
-			audioOpen = FALSE;
-			XSDEBUG("closed\n");
-		}
-
-		/* Now determine if we continue by selecting other subtune or something */
-		if (!myStatus.isPlaying && !xs_cfg.subAutoEnable)
-			doPlay = FALSE;
+		XS_MUTEX_UNLOCK(xs_status);
 	}
 
 xs_err_exit:
@@ -562,46 +567,6 @@
 
 
 /*
- * Start playing the given file
- * Here we load the tune and initialize the playing thread.
- * Usually you would also initialize the output-plugin, but
- * this is XMMS-SID and we do it on the player thread instead.
- */
-void xs_play_file(InputPlayback *pb)
-{
-	assert(pb);
-	assert(xs_status.sidPlayer);
-	
-	XSDEBUG("play '%s'\n", pb->filename);
-
-	/* Get tune information */
-	if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(pb->filename)) == NULL)
-		return;
-
-	/* Initialize the tune */
-	if (!xs_status.sidPlayer->plrLoadSID(&xs_status, pb->filename)) {
-		xs_tuneinfo_free(xs_status.tuneInfo);
-		xs_status.tuneInfo = NULL;
-		return;
-	}
-
-	XSDEBUG("load ok\n");
-
-	/* Set general status information */
-	xs_status.isPlaying = TRUE;
-	xs_status.isError = FALSE;
-	xs_status.currSong = xs_status.tuneInfo->startTune;
-
-	/* Start the playing thread! */
-	xs_decode_thread = g_thread_self();
-	pb->set_pb_ready(pb);
-	xs_playthread(pb);
-
-	XSDEBUG("playback is done\n");
-}
-
-
-/*
  * Stop playing
  * Here we set the playing status to stop and wait for playing
  * thread to shut down. In any "correctly" done plugin, this is
@@ -617,9 +582,6 @@
 	
 	XSDEBUG("stop requested\n");
 
-	/* Close the sub-tune control window, if any */
-	xs_subctrl_close();
-
 	/* Lock xs_status and stop playing thread */
 	XS_MUTEX_LOCK(xs_status);
 	if (xs_status.isPlaying) {
@@ -633,11 +595,6 @@
 
 	XSDEBUG("done, updating status\n");
 	
-	/* Status is now stopped, update the sub-tune
-	 * controller in fileinfo window (if open)
-	 */
-	xs_fileinfo_update();
-
 	/* Free tune information */
 	XS_MUTEX_LOCK(xs_status);
 	xs_status.sidPlayer->plrDeleteSID(&xs_status);
@@ -653,233 +610,15 @@
  */
 void xs_pause(InputPlayback *pb, short pauseState)
 {
-	xs_subctrl_close();
-	xs_fileinfo_update();
 	pb->output->pause(pauseState);
 }
 
 
 /*
- * Pop-up subtune selector
- */
-void xs_subctrl_setsong(void)
-{
-	gint n;
-
-	XS_MUTEX_LOCK(xs_status);
-	XS_MUTEX_LOCK(xs_subctrl);
-
-	if (xs_status.tuneInfo && xs_status.isPlaying) {
-		n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
-		if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes))
-			xs_status.currSong = n;
-	}
-
-	XS_MUTEX_UNLOCK(xs_subctrl);
-	XS_MUTEX_UNLOCK(xs_status);
-}
-
-
-void xs_subctrl_prevsong(void)
-{
-	XS_MUTEX_LOCK(xs_status);
-
-	if (xs_status.tuneInfo && xs_status.isPlaying) {
-		if (xs_status.currSong > 1)
-			xs_status.currSong--;
-	}
-
-	XS_MUTEX_UNLOCK(xs_status);
-
-	xs_subctrl_update();
-}
-
-
-void xs_subctrl_nextsong(void)
-{
-	XS_MUTEX_LOCK(xs_status);
-
-	if (xs_status.tuneInfo && xs_status.isPlaying) {
-		if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
-			xs_status.currSong++;
-	}
-
-	XS_MUTEX_UNLOCK(xs_status);
-
-	xs_subctrl_update();
-}
-
-
-void xs_subctrl_update(void)
-{
-	GtkAdjustment *tmpAdj;
-
-	XS_MUTEX_LOCK(xs_status);
-	XS_MUTEX_LOCK(xs_subctrl);
-
-	/* Check if control window exists, we are currently playing and have a tune */
-	if (xs_subctrl) {
-		if (xs_status.tuneInfo && xs_status.isPlaying) {
-			tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
-
-			tmpAdj->value = xs_status.currSong;
-			tmpAdj->lower = 1;
-			tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
-			XS_MUTEX_UNLOCK(xs_status);
-			XS_MUTEX_UNLOCK(xs_subctrl);
-			gtk_adjustment_value_changed(tmpAdj);
-		} else {
-			XS_MUTEX_UNLOCK(xs_status);
-			XS_MUTEX_UNLOCK(xs_subctrl);
-			xs_subctrl_close();
-		}
-	} else {
-		XS_MUTEX_UNLOCK(xs_subctrl);
-		XS_MUTEX_UNLOCK(xs_status);
-	}
-
-	xs_fileinfo_update();
-}
-
-
-void xs_subctrl_close(void)
-{
-	XS_MUTEX_LOCK(xs_subctrl);
-
-	if (xs_subctrl) {
-		gtk_widget_destroy(xs_subctrl);
-		xs_subctrl = NULL;
-	}
-
-	XS_MUTEX_UNLOCK(xs_subctrl);
-}
-
-
-gboolean xs_subctrl_keypress(GtkWidget * win, GdkEventKey * ev)
-{
-	(void) win;
-
-	if (ev->keyval == GDK_Escape)
-		xs_subctrl_close();
-
-	return FALSE;
-}
-
-
-void xs_subctrl_open(void)
-{
-	GtkWidget *frame25, *hbox15, *subctrl_prev, *subctrl_current, *subctrl_next;
-
-	XS_MUTEX_LOCK(xs_subctrl);
-	if (!xs_status.tuneInfo || !xs_status.isPlaying ||
-		xs_subctrl || (xs_status.tuneInfo->nsubTunes <= 1)) {
-		XS_MUTEX_UNLOCK(xs_subctrl);
-		return;
-	}
-
-	/* Create the pop-up window */
-	xs_subctrl = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_type_hint(GTK_WINDOW(xs_subctrl), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_widget_set_name(xs_subctrl, "xs_subctrl");
-	g_object_set_data(G_OBJECT(xs_subctrl), "xs_subctrl", xs_subctrl);
-
-	gtk_window_set_title(GTK_WINDOW(xs_subctrl), _("Subtune Control"));
-	gtk_window_set_position(GTK_WINDOW(xs_subctrl), GTK_WIN_POS_MOUSE);
-	gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
-	gtk_window_set_policy(GTK_WINDOW(xs_subctrl), FALSE, FALSE, FALSE);
-
-	g_signal_connect(G_OBJECT(xs_subctrl), "destroy", G_CALLBACK(gtk_widget_destroyed), &xs_subctrl);
-
-	g_signal_connect(G_OBJECT(xs_subctrl), "focus_out_event", G_CALLBACK(xs_subctrl_close), NULL);
-
-	gtk_widget_realize(xs_subctrl);
-	gdk_window_set_decorations(xs_subctrl->window, (GdkWMDecoration) 0);
-
-
-	/* Create the control widgets */
-	frame25 = gtk_frame_new(NULL);
-	gtk_container_add(GTK_CONTAINER(xs_subctrl), frame25);
-	gtk_container_set_border_width(GTK_CONTAINER(frame25), 2);
-	gtk_frame_set_shadow_type(GTK_FRAME(frame25), GTK_SHADOW_OUT);
-
-	hbox15 = gtk_hbox_new(FALSE, 4);
-	gtk_container_add(GTK_CONTAINER(frame25), hbox15);
-
-	subctrl_prev = gtk_button_new_with_label(" < ");
-	gtk_widget_set_name(subctrl_prev, "subctrl_prev");
-	gtk_box_pack_start(GTK_BOX(hbox15), subctrl_prev, FALSE, FALSE, 0);
-
-	xs_subctrl_adj = gtk_adjustment_new(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes, 1, 1, 0);
-	g_signal_connect(G_OBJECT(xs_subctrl_adj), "value_changed", G_CALLBACK(xs_subctrl_setsong), NULL);
-
-	subctrl_current = gtk_hscale_new(GTK_ADJUSTMENT(xs_subctrl_adj));
-	gtk_widget_set_size_request(subctrl_current, 80, -1);
-	gtk_widget_set_name(subctrl_current, "subctrl_current");
-	gtk_box_pack_start(GTK_BOX(hbox15), subctrl_current, FALSE, TRUE, 0);
-	gtk_scale_set_digits(GTK_SCALE(subctrl_current), 0);
-	gtk_range_set_update_policy(GTK_RANGE(subctrl_current), GTK_UPDATE_DELAYED);
-	gtk_widget_grab_focus(subctrl_current);
-
-	subctrl_next = gtk_button_new_with_label(" > ");
-	gtk_widget_set_name(subctrl_next, "subctrl_next");
-	gtk_box_pack_start(GTK_BOX(hbox15), subctrl_next, FALSE, FALSE, 0);
-
-	g_signal_connect(G_OBJECT(subctrl_prev), "clicked", G_CALLBACK(xs_subctrl_prevsong), NULL);
-
-	g_signal_connect(G_OBJECT(subctrl_next), "clicked", G_CALLBACK(xs_subctrl_nextsong), NULL);
-
-	g_signal_connect(G_OBJECT(xs_subctrl), "key_press_event", G_CALLBACK(xs_subctrl_keypress), NULL);
-
-	gtk_widget_show_all(xs_subctrl);
-
-	XS_MUTEX_UNLOCK(xs_subctrl);
-}
-
-
-/*
- * Set the time-seek position
- * The playing thread will do the "seeking", which means sub-tune
- * changing in XMMS-SID's case. iTime argument is time in seconds,
- * in contrast to milliseconds used in other occasions.
- *
- * This function is called whenever position slider is clicked or
- * other method of seeking is used (keyboard, etc.)
+ * A stub seek function (Audacious will crash if seek is NULL)
  */
 void xs_seek(InputPlayback *pb, gint iTime)
 {
-	/* Check status */
-	XS_MUTEX_LOCK(xs_status);
-	if (!xs_status.tuneInfo || !xs_status.isPlaying) {
-		XS_MUTEX_UNLOCK(xs_status);
-		return;
-	}
-
-	/* Act according to settings */
-	switch (xs_cfg.subsongControl) {
-	case XS_SSC_SEEK:
-		if (iTime < xs_status.lastTime) {
-			if (xs_status.currSong > 1)
-				xs_status.currSong--;
-		} else if (iTime > xs_status.lastTime) {
-			if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
-				xs_status.currSong++;
-		}
-		break;
-
-	case XS_SSC_POPUP:
-		xs_subctrl_open();
-		break;
-
-		/* If we have song-position patch, check settings */
-#ifdef HAVE_SONG_POSITION
-	case XS_SSC_PATCH:
-		if ((iTime > 0) && (iTime <= xs_status.tuneInfo->nsubTunes))
-			xs_status.currSong = iTime;
-		break;
-#endif
-	}
-
-	XS_MUTEX_UNLOCK(xs_status);
 }
 
 
@@ -911,19 +650,6 @@
 		return -1;
 	}
 
-	/* Let's see what we do */
-	switch (xs_cfg.subsongControl) {
-	case XS_SSC_SEEK:
-		xs_status.lastTime = (pb->output->output_time() / 1000);
-		break;
-
-#ifdef HAVE_SONG_POSITION
-	case XS_SSC_PATCH:
-		set_song_position(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes);
-		break;
-#endif
-	}
-
 	XS_MUTEX_UNLOCK(xs_status);
 
 	/* Return output time reported by audio output plugin */
@@ -931,243 +657,90 @@
 }
 
 
-/* Return song information: called by XMMS when initially loading the playlist.
- * Subsequent changes to information are made by the player thread,
- * which uses xs_plugin_ip.set_info();
+/* Return song information Tuple
  */
-void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
+void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune)
 {
-	t_xs_tuneinfo *pInfo;
-	
-	XS_MUTEX_LOCK(xs_status);
+	gchar *tmpStr, tmpStr2[64];
 
-	/* Get tune information from emulation engine */
-	pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
-	if (!pInfo) {
-		XS_MUTEX_UNLOCK(xs_status);
-		return;
-	}
+	tuple_associate_string(pResult, "title", pInfo->sidName);
+	tuple_associate_string(pResult, "artist", pInfo->sidComposer);
+	tuple_associate_string(pResult, "genre", "SID-tune");
+	tuple_associate_string(pResult, "copyright", pInfo->sidCopyright);
+
+	tuple_associate_int(pResult, "subtunes", pInfo->nsubTunes);
+	tuple_associate_string(pResult, "sid-format", pInfo->sidFormat);
 
+	switch (pInfo->sidModel) {
+		case XS_SIDMODEL_6581: tmpStr = "6581"; break;
+		case XS_SIDMODEL_8580: tmpStr = "8580"; break;
+		case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
+		default: tmpStr = "?"; break;
+	}
+	tuple_associate_string(pResult, "sid-model", tmpStr);
+	
 	/* Get sub-tune information, if available */
-	if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
-		gint tmpInt;
+	if (subTune < 0 || pInfo->startTune > pInfo->nsubTunes)
+		subTune = pInfo->startTune;
+	
+	if ((subTune > 0) && (subTune <= pInfo->nsubTunes)) {
+		gint tmpInt = pInfo->subTunes[subTune - 1].tuneLength;
+		tuple_associate_int(pResult, "length", (tmpInt < 0) ? -1 : tmpInt * 1000);
 		
-		(*songTitle) = xs_make_titlestring(pInfo, pInfo->startTune);
+		tmpInt = pInfo->subTunes[subTune - 1].tuneSpeed;
+		if (tmpInt > 0) {
+			switch (tmpInt) {
+			case XS_CLOCK_PAL: tmpStr = "PAL"; break;
+			case XS_CLOCK_NTSC: tmpStr = "NTSC"; break;
+			case XS_CLOCK_ANY: tmpStr = "ANY"; break;
+			case XS_CLOCK_VBI: tmpStr = "VBI"; break;
+			case XS_CLOCK_CIA: tmpStr = "CIA"; break;
+			default:
+				g_snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
+				tmpStr = tmpStr2;
+				break;
+			}
+		} else
+			tmpStr = "?";
 
-		tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
-		if (tmpInt < 0)
-			(*songLength) = -1;
-		else
-			(*songLength) = (tmpInt * 1000);
-	}
+		tuple_associate_string(pResult, "sid-speed", tmpStr);
+	} else
+		subTune = 1;
 
-	/* Free tune information */
-	xs_tuneinfo_free(pInfo);
-	XS_MUTEX_UNLOCK(xs_status);
+	tuple_associate_int(pResult, "subtune", subTune);
+	tuple_associate_int(pResult, "track-number", subTune);
+
+	if (xs_cfg.titleOverride)
+		tuple_associate_string(pResult, "formatter", xs_cfg.titleFormat);
 }
 
-
-t_xs_tuple * xs_get_song_tuple(gchar *songFilename)
+Tuple * xs_get_song_tuple(gchar *songFilename)
 {
-	t_xs_tuneinfo *pInfo;
-	t_xs_tuple *pResult = NULL;
-
-	XS_MUTEX_LOCK(xs_status);
-
-	/* Get tune information from emulation engine */
-	pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
-	if (!pInfo) {
-		XS_MUTEX_UNLOCK(xs_status);
-		return NULL;
-	}
-
-	/* Get sub-tune information, if available */
-	if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
-		gint tmpInt;
-		
-		pResult = xs_make_titletuple(pInfo, pInfo->startTune);
-
-		tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
-#ifdef AUDACIOUS_PLUGIN
-		if (tmpInt < 0)
-			tuple_associate_int(pResult, "length", -1);
-		else
-		   tuple_associate_int(pResult, "length", tmpInt * 1000);
-#else
-		if (tmpInt < 0)
-			pResult->length = -1;
-		else
-			pResult->length = (tmpInt * 1000);
-#endif
-	}
-
-	/* Free tune information */
-	xs_tuneinfo_free(pInfo);
-
-	XS_MUTEX_UNLOCK(xs_status);
+	Tuple *tmpResult;
+	gchar *tmpFilename;
+	t_xs_tuneinfo *tmpInfo;
+	gint subTune;
 
-	return pResult;
-}
-
-
-/* Allocate a new tune information structure
- */
-t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
-		gint nsubTunes, gint startTune, const gchar * sidName,
-		const gchar * sidComposer, const gchar * sidCopyright,
-		gint loadAddr, gint initAddr, gint playAddr,
-		gint dataFileLen, const gchar *sidFormat, gint sidModel)
-{
-	t_xs_tuneinfo *pResult;
-	t_xs_sldb_node *tmpLength;
-	gint i;
+	/* Get information from URL */
+	xs_get_trackinfo(songFilename, &tmpFilename, &subTune);
 
-	/* Allocate structure */
-	pResult = (t_xs_tuneinfo *) g_malloc0(sizeof(t_xs_tuneinfo));
-	if (!pResult) {
-		xs_error(_("Could not allocate memory for t_xs_tuneinfo ('%s')\n"),
-			pcFilename);
-		return NULL;
-	}
-
-	pResult->sidFilename = g_filename_to_utf8(pcFilename, -1, NULL, NULL, NULL);
-	if (!pResult->sidFilename) {
-		xs_error(_("Could not allocate sidFilename ('%s')\n"),
-			pcFilename);
-		g_free(pResult);
-		return NULL;
-	}
-
-	/* Allocate space for subtune information */
-	pResult->subTunes = g_malloc0(sizeof(t_xs_subtuneinfo) * (nsubTunes + 1));
-	if (!pResult->subTunes) {
-		xs_error(_("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"),
-			pcFilename, nsubTunes);
-
-		g_free(pResult->sidFilename);
-		g_free(pResult);
+	tmpResult = tuple_new_from_filename(tmpFilename);
+	if (!tmpResult) {
+		g_free(tmpFilename);
 		return NULL;
 	}
 
-	/* The following allocations don't matter if they fail */
-	pResult->sidName = XS_CS_SID(sidName);
-	pResult->sidComposer = XS_CS_SID(sidComposer);
-	pResult->sidCopyright = XS_CS_SID(sidCopyright);
-
-	pResult->nsubTunes = nsubTunes;
-	pResult->startTune = startTune;
-
-	pResult->loadAddr = loadAddr;
-	pResult->initAddr = initAddr;
-	pResult->playAddr = playAddr;
-	pResult->dataFileLen = dataFileLen;
-	pResult->sidFormat = XS_CS_SID(sidFormat);
-	
-	pResult->sidModel = sidModel;
-
-	/* Get length information (NOTE: Do not free this!) */
-	tmpLength = xs_songlen_get(pcFilename);
-	
-	/* Fill in sub-tune information */
-	for (i = 0; i < pResult->nsubTunes; i++) {
-		if (tmpLength && (i < tmpLength->nLengths))
-			pResult->subTunes[i].tuneLength = tmpLength->sLengths[i];
-		else
-			pResult->subTunes[i].tuneLength = -1;
-		
-		pResult->subTunes[i].tuneSpeed = -1;
-	}
-	
-	return pResult;
-}
-
-
-/* Free given tune information structure
- */
-void xs_tuneinfo_free(t_xs_tuneinfo * pTune)
-{
-	if (!pTune) return;
-
-	g_free(pTune->subTunes);
-	g_free(pTune->sidFilename);
-	g_free(pTune->sidName);
-	g_free(pTune->sidComposer);
-	g_free(pTune->sidCopyright);
-	g_free(pTune->sidFormat);
-	g_free(pTune);
-}
-
-
-/* Song length database handling glue
- */
-gint xs_songlen_init(void)
-{
-	XS_MUTEX_LOCK(xs_cfg);
-
-	if (!xs_cfg.songlenDBPath) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		return -1;
-	}
+	/* Get tune information from emulation engine */
+	XS_MUTEX_LOCK(xs_status);
+	tmpInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename);
+	XS_MUTEX_UNLOCK(xs_status);
+	g_free(tmpFilename);
 
-	XS_MUTEX_LOCK(xs_sldb_db);
-
-	/* Check if already initialized */
-	if (xs_sldb_db)
-		xs_sldb_free(xs_sldb_db);
-
-	/* Allocate database */
-	xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
-	if (!xs_sldb_db) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -2;
-	}
-
-	/* Read the database */
-	if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
-		xs_sldb_free(xs_sldb_db);
-		xs_sldb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -3;
-	}
+	if (!tmpInfo)
+		return tmpResult;
+	
+	xs_get_song_tuple_info(tmpResult, tmpInfo, subTune);
+	xs_tuneinfo_free(tmpInfo);
 
-	/* Create index */
-	if (xs_sldb_index(xs_sldb_db) != 0) {
-		xs_sldb_free(xs_sldb_db);
-		xs_sldb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -4;
-	}
-
-	XS_MUTEX_UNLOCK(xs_cfg);
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-	return 0;
+	return tmpResult;
 }
-
-
-void xs_songlen_close(void)
-{
-	XS_MUTEX_LOCK(xs_sldb_db);
-	xs_sldb_free(xs_sldb_db);
-	xs_sldb_db = NULL;
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-}
-
-
-t_xs_sldb_node *xs_songlen_get(const gchar * pcFilename)
-{
-	t_xs_sldb_node *pResult;
-
-	XS_MUTEX_LOCK(xs_sldb_db);
-
-	if (xs_cfg.songlenDBEnable && xs_sldb_db)
-		pResult = xs_sldb_get(xs_sldb_db, pcFilename);
-	else
-		pResult = NULL;
-
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-
-	return pResult;
-}
--- a/src/sid/xmms-sid.glade	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xmms-sid.glade	Fri Sep 07 04:04:03 2007 -0500
@@ -5,7 +5,7 @@
 
 <widget class="GtkWindow" id="xs_configwin">
   <property name="visible">True</property>
-  <property name="title" translatable="yes">Audacious-SID Configuration</property>
+  <property name="title" translatable="yes">Audacious-SID configuration</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -18,6 +18,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
+  <signal name="delete_event" handler="xs_configwin_delete"/>
 
   <child>
     <widget class="GtkVBox" id="w_vbox1">
@@ -280,7 +281,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
+			      <property name="invisible_char">●</property>
 			      <property name="activates_default">False</property>
 			    </widget>
 			  </child>
@@ -297,188 +298,6 @@
 				  <child>
 				    <widget class="GtkLabel" id="convertwidget3">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="no">8000</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget4">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget5">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">11025</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget6">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget7">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">22050</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget8">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget9">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">44100</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget10">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget11">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">48000</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget12">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget13">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">64000</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget14">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget15">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="no">96000</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkListItem" id="convertwidget16">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="convertwidget17">
-				      <property name="visible">True</property>
 				      <property name="label" translatable="yes"></property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
@@ -997,7 +816,7 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
+		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
@@ -1794,7 +1613,7 @@
 			      <property name="border_width">2</property>
 			      <property name="visible">True</property>
 			      <property name="value_in_list">False</property>
-			      <property name="allow_empty">True</property>
+			      <property name="allow_empty">False</property>
 			      <property name="case_sensitive">False</property>
 			      <property name="enable_arrow_keys">True</property>
 			      <property name="enable_arrows_always">False</property>
@@ -1808,126 +1627,22 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
+				  <property name="invisible_char">●</property>
 				  <property name="activates_default">False</property>
 				</widget>
 			      </child>
 
 			      <child internal-child="list">
-				<widget class="GtkList" id="convertwidget18">
+				<widget class="GtkList" id="convertwidget4">
 				  <property name="visible">True</property>
 				  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
 
 				  <child>
-				    <widget class="GtkListItem" id="convertwidget19">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkLabel" id="convertwidget20">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">6581 (reSID)</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="convertwidget21">
+				    <widget class="GtkListItem" id="convertwidget5">
 				      <property name="visible">True</property>
 
 				      <child>
-					<widget class="GtkLabel" id="convertwidget22">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">8580 (reSID)</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="convertwidget23">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkLabel" id="convertwidget24">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">6581R1 (alankila)</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="convertwidget25">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkLabel" id="convertwidget26">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">6581R4 (alankila)</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="convertwidget27">
-				      <property name="visible">True</property>
-
-				      <child>
-					<widget class="GtkLabel" id="convertwidget28">
+					<widget class="GtkLabel" id="convertwidget6">
 					  <property name="visible">True</property>
 					  <property name="label" translatable="yes"></property>
 					  <property name="use_underline">False</property>
@@ -1962,17 +1677,38 @@
 			      <property name="border_width">2</property>
 			      <property name="visible">True</property>
 			      <property name="n_rows">2</property>
-			      <property name="n_columns">2</property>
+			      <property name="n_columns">3</property>
 			      <property name="homogeneous">True</property>
 			      <property name="row_spacing">4</property>
 			      <property name="column_spacing">4</property>
 
 			      <child>
+				<widget class="GtkButton" id="cfg_sp2_filter_export">
+				  <property name="visible">True</property>
+				  <property name="can_default">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Export</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="clicked" handler="xs_cfg_sp2_filter_export"/>
+				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
 				<widget class="GtkButton" id="cfg_sp2_filter_load">
 				  <property name="visible">True</property>
 				  <property name="can_default">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Load</property>
+				  <property name="label" translatable="yes">Use</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -2021,8 +1757,8 @@
 				  <signal name="clicked" handler="xs_cfg_sp2_filter_import"/>
 				</widget>
 				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
 				  <property name="x_options">fill</property>
@@ -2031,21 +1767,21 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_export">
+				<widget class="GtkButton" id="cfg_sp2_filter_delete">
 				  <property name="visible">True</property>
 				  <property name="can_default">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Export</property>
+				  <property name="label" translatable="yes">Delete</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="xs_cfg_sp2_filter_export"/>
+				  <signal name="clicked" handler="xs_cfg_sp2_filter_delete"/>
 				</widget>
 				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -2527,7 +2263,7 @@
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="xs_cfg_sld_enable_toggled"/>
+			  <signal name="toggled" handler="xs_cfg_sldb_enable_toggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -2577,7 +2313,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
+			      <property name="invisible_char">●</property>
 			      <property name="activates_default">False</property>
 			    </widget>
 			    <packing>
@@ -2596,7 +2332,7 @@
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
-			      <signal name="clicked" handler="xs_cfg_sld_dbbrowse"/>
+			      <signal name="clicked" handler="xs_cfg_sldb_browse"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2674,12 +2410,331 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="w_vbox33">
+	    <widget class="GtkFrame" id="frame1">
+	      <property name="border_width">4</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox1">
+		  <property name="border_width">2</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">2</property>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="cfg_ftitle_override">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">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.</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Override generic Tuplez format string</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		      <signal name="toggled" handler="xs_cfg_ftitle_override_toggled" last_modification_time="Wed, 05 Sep 2007 21:51:50 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="cfg_ftitle_box">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkEntry" id="cfg_ftitle_format">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Tuplez format string for SID-files</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">●</property>
+			  <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="cfg_ftitle_descs">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Descriptions of &lt;i&gt;SID-specific&lt;/i&gt; Tuplez fields go here. &lt;b&gt;:D&lt;/b&gt;</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">True</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">8</property>
+			  <property name="ypad">8</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label29">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Song title format:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="w_label27">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Title</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="w_vbox19">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
 	      <child>
+		<widget class="GtkFrame" id="w_frame31">
+		  <property name="border_width">4</property>
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="w_vbox35">
+		      <property name="border_width">2</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
+
+		      <child>
+			<widget class="GtkCheckButton" id="cfg_subauto_enable">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Add sub-tunes to playlist</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="xs_cfg_subauto_enable_toggled"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="cfg_subauto_min_only">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Only add sub-tunes that have a duration of at least specified time.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Only tunes with specified minimum duration</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="xs_cfg_subauto_min_only_toggled"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="cfg_subauto_box">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">2</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="w_label52">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Playtime:</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_CENTER</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="cfg_subauto_mintime">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">15 1 32767 1 60 60</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="w_label53">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">seconds</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_CENTER</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label21">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Sub-tune handling:</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="type">label_item</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkFrame" id="w_frame7">
 		  <property name="border_width">4</property>
 		  <property name="visible">True</property>
@@ -2768,7 +2823,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
+				  <property name="invisible_char">●</property>
 				  <property name="activates_default">False</property>
 				</widget>
 			      </child>
@@ -2874,7 +2929,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
+				  <property name="invisible_char">●</property>
 				  <property name="activates_default">False</property>
 				</widget>
 			      </child>
@@ -2955,581 +3010,7 @@
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="w_frame16">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox1">
-		      <property name="border_width">2</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="cfg_ftitle_override">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">XMMS v1.2.5 and later support generic titlestring formatting (see XMMS preferences). This option can be enabled to override those generic titles with Audacious-SID specific ones. Formatting mnemonics are explained briefly below.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Override generic XMMS titles</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="xs_cfg_ftitle_override_toggled"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="cfg_ftitle_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkEntry" id="cfg_ftitle_format">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">2</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="w_hbox9">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="cfg_ftitle_desc1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">%% - '%' character
-%p - Performer/composer
-%t - Song name (title)
-%c - Copyright
-%s - File type
-%m - SID model</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.0399999991059</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="cfg_ftitle_desc2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">%C - Speed/clock (PAL/NTSC)
-%n - Subtune
-%N - Number of subtunes
-%f - Filename
-%F - File path
-%e - File extension</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.0399999991059</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">2</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label19">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Song name/title format:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="w_label23">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Title</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="w_vbox19">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkFrame" id="w_frame28">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="w_vbox31">
-		      <property name="border_width">2</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkRadioButton" id="cfg_subctrl_none">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">No sub-tune control.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Disabled</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="cfg_subctrl_seek">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Seeking backwards/forwards selects previous/next sub-tune, similar to selector used in XMMS-SidPlay.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Seek back/forward changes sub-tune</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <property name="group">cfg_subctrl_none</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="cfg_subctrl_popup">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">By pressing the seekbar a sub-tune control window pops up, in style of UADE (Unix Amiga Delitracker Emulator)</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Pop-up via seekbar (UADE-style)</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <property name="group">cfg_subctrl_none</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="cfg_subctrl_patch">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Seekbar works as a sub-tune selector (Best option if you have patched your XMMS with the song-position patch.)</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Song-position patch</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <property name="group">cfg_subctrl_none</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label20">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Sub-tune control:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="w_frame31">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="w_vbox35">
-		      <property name="border_width">2</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="cfg_subauto_enable">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Go through all sub-tunes in file</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="xs_cfg_subauto_enable_toggled"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="cfg_subauto_min_only">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Only tunes with specified minimum length </property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="xs_cfg_subauto_min_only_toggled"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="cfg_subauto_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="w_label52">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Playtime:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="cfg_subauto_mintime">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">False</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">15 1 32767 1 60 60</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="w_label53">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">seconds</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label21">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Automatic sub-tune changes:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="w_frame22">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="w_vbox22">
-		      <property name="border_width">2</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="cfg_detectmagic">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Determine if file is a SID-tune by checking the file contents. If NOT selected, filetype is determined by checking filename extension (.sid, .dat, ...)</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Detect file by contents (slower)</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label22">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Miscellaneous options:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 	    </widget>
@@ -3574,7 +3055,7 @@
 	  <property name="border_width">4</property>
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">15</property>
+	  <property name="spacing">8</property>
 
 	  <child>
 	    <widget class="GtkButton" id="cfg_ok">
@@ -3616,12 +3097,12 @@
 </widget>
 
 <widget class="GtkWindow" id="xs_fileinfowin">
+  <property name="width_request">400</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Audacious-SID Fileinfo</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="default_width">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -3640,98 +3121,6 @@
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkAlignment" id="w_alignment8">
-	  <property name="border_width">2</property>
-	  <property name="visible">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xscale">0.10000000149</property>
-	  <property name="yscale">1</property>
-	  <property name="top_padding">0</property>
-	  <property name="bottom_padding">0</property>
-	  <property name="left_padding">0</property>
-	  <property name="right_padding">0</property>
-
-	  <child>
-	    <widget class="GtkFrame" id="w_frame30">
-	      <property name="border_width">2</property>
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkHBox" id="w_hbox19">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="fileinfo_subctrl_prev">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes"> &lt; </property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="xs_subctrl_prevsong"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHScale" id="fileinfo_subctrl_adj">
-		      <property name="width_request">80</property>
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="draw_value">True</property>
-		      <property name="value_pos">GTK_POS_TOP</property>
-		      <property name="digits">0</property>
-		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		      <property name="inverted">False</property>
-		      <property name="adjustment">0 0 0 0 0 0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="fileinfo_subctrl_next">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes"> &gt; </property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="xs_subctrl_nextsong"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
 	<widget class="GtkFrame" id="w_frame14">
 	  <property name="border_width">4</property>
 	  <property name="visible">True</property>
@@ -3870,7 +3259,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char">●</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -3891,7 +3280,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char">●</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -3912,7 +3301,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char">●</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -3933,7 +3322,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char">●</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -3996,26 +3385,18 @@
 		  <property name="border_width">2</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
+		  <property name="history">-1</property>
 
 		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget29">
+		    <widget class="GtkMenu" id="convertwidget7">
 		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget30">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"> </property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
 		    </widget>
 		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 
@@ -4066,7 +3447,7 @@
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
+		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -4115,7 +3496,7 @@
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
+		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -4164,7 +3545,7 @@
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
+		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -4253,7 +3634,7 @@
 
       <child>
 	<widget class="GtkButton" id="button2">
-	  <property name="border_width">6</property>
+	  <property name="border_width">4</property>
 	  <property name="visible">True</property>
 	  <property name="can_default">True</property>
 	  <property name="has_default">True</property>
@@ -4275,7 +3656,7 @@
   </child>
 </widget>
 
-<widget class="GtkFileSelection" id="xs_sldbfileselector">
+<widget class="GtkFileSelection" id="xs_sldb_fs">
   <property name="border_width">10</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Select HVSC song length database</property>
@@ -4292,6 +3673,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="show_fileops">True</property>
+  <signal name="delete_event" handler="xs_sldb_fs_delete"/>
 
   <child internal-child="cancel_button">
     <widget class="GtkButton" id="cancel_button2">
@@ -4300,7 +3682,7 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_sldb_fs_cancel"/>
+      <signal name="clicked" handler="xs_sldb_fs_cancel"/>
     </widget>
   </child>
 
@@ -4311,15 +3693,15 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_sldb_fs_ok"/>
+      <signal name="clicked" handler="xs_sldb_fs_ok"/>
     </widget>
   </child>
 </widget>
 
-<widget class="GtkFileSelection" id="xs_stilfileselector">
+<widget class="GtkFileSelection" id="xs_stil_fs">
   <property name="border_width">10</property>
   <property name="visible">True</property>
-  <property name="title" translatable="yes">Select STIL-database </property>
+  <property name="title" translatable="yes">Select STIL-database</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
@@ -4333,6 +3715,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="show_fileops">True</property>
+  <signal name="delete_event" handler="xs_stil_fs_delete"/>
 
   <child internal-child="cancel_button">
     <widget class="GtkButton" id="cancel_button3">
@@ -4341,7 +3724,7 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_stil_fs_cancel"/>
+      <signal name="clicked" handler="xs_stil_fs_cancel"/>
     </widget>
   </child>
 
@@ -4352,12 +3735,12 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_stil_fs_ok"/>
+      <signal name="clicked" handler="xs_stil_fs_ok"/>
     </widget>
   </child>
 </widget>
 
-<widget class="GtkFileSelection" id="xs_hvscpathselector">
+<widget class="GtkFileSelection" id="xs_hvsc_fs">
   <property name="border_width">10</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Select HVSC location prefix</property>
@@ -4374,6 +3757,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="show_fileops">True</property>
+  <signal name="delete_event" handler="xs_hvsc_fs_delete"/>
 
   <child internal-child="cancel_button">
     <widget class="GtkButton" id="cancel_button4">
@@ -4382,7 +3766,7 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_hvsc_fs_cancel"/>
+      <signal name="clicked" handler="xs_hvsc_fs_cancel"/>
     </widget>
   </child>
 
@@ -4393,7 +3777,205 @@
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
       <property name="focus_on_click">True</property>
-      <signal name="clicked" handler="xs_cfg_hvsc_fs_ok"/>
+      <signal name="clicked" handler="xs_hvsc_fs_ok"/>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkFileSelection" id="xs_filter_import_fs">
+  <property name="border_width">10</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Select SIDPlay2 filters file for importing</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="show_fileops">True</property>
+  <signal name="delete_event" handler="xs_filter_import_fs_delete"/>
+
+  <child internal-child="cancel_button">
+    <widget class="GtkButton" id="cancel_button64">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+      <signal name="clicked" handler="xs_filter_import_fs_cancel"/>
+    </widget>
+  </child>
+
+  <child internal-child="ok_button">
+    <widget class="GtkButton" id="ok_button64">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+      <signal name="clicked" handler="xs_filter_import_fs_ok"/>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkFileSelection" id="xs_filter_export_fs">
+  <property name="border_width">10</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Select SIDPlay2 filters file for exporting</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="show_fileops">True</property>
+  <signal name="delete_event" handler="xs_filter_export_fs_delete"/>
+
+  <child internal-child="cancel_button">
+    <widget class="GtkButton" id="cancel_button64">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+      <signal name="clicked" handler="xs_filter_export_fs_cancel"/>
+    </widget>
+  </child>
+
+  <child internal-child="ok_button">
+    <widget class="GtkButton" id="ok_button64">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+      <signal name="clicked" handler="xs_filter_export_fs_ok"/>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="xs_confirmwin">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Confirm selected action</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+  <signal name="delete_event" handler="xs_confirmwin_delete"/>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkHButtonBox" id="hbuttonbox2">
+	      <property name="visible">True</property>
+	      <property name="layout_style">GTK_BUTTONBOX_END</property>
+	      <property name="spacing">8</property>
+
+	      <child>
+		<widget class="GtkButton" id="xs_confirm_yes">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Yes</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="xs_confirm_no">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">No</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkFrame" id="xs_confirm_frame">
+	  <property name="border_width">6</property>
+	  <property name="visible">True</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label25">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Confirm selected action</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">label_item</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
     </widget>
   </child>
 </widget>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sid/xmms-sid.gladep	Fri Sep 07 04:04:03 2007 -0500
@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
+
+<glade-project>
+  <name>audacious-sid</name>
+  <program_name>audacious-sid</program_name>
+  <source_directory>.</source_directory>
+  <pixmaps_directory>.</pixmaps_directory>
+  <gnome_support>FALSE</gnome_support>
+  <use_widget_names>TRUE</use_widget_names>
+  <output_main_file>FALSE</output_main_file>
+  <output_build_files>FALSE</output_build_files>
+  <backup_source_files>FALSE</backup_source_files>
+  <main_source_file>xs_interface.c</main_source_file>
+  <main_header_file>xs_interface.h</main_header_file>
+  <handler_source_file>xs_genui.c</handler_source_file>
+  <handler_header_file>xs_genui.h</handler_header_file>
+  <support_source_file>xs_glade.c</support_source_file>
+  <support_header_file>xs_glade.h</support_header_file>
+</glade-project>
--- a/src/sid/xmms-sid.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xmms-sid.h	Fri Sep 07 04:04:03 2007 -0500
@@ -30,29 +30,6 @@
 #endif
 
 /*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
-
-/*
  * Some constants and defines
  */
 /* #define to enable spurious debugging messages for development
@@ -86,8 +63,8 @@
 
 /* Configuration section identifier
  */
-#define XS_PACKAGE_STRING	"Audacious-SID v0.8.0beta18"
-#define XS_CONFIG_IDENT		"sid"		/* Configuration file identifier */
+#define XS_PACKAGE_STRING	"Audacious-SID"
+#define XS_CONFIG_IDENT		"sid"
 
 /* Default audio rendering frequency in Hz
  */
@@ -129,15 +106,27 @@
 #define XS_THREAD_EXIT(M)	g_thread_exit(M)
 #define XS_THREAD_JOIN(M)	g_thread_join(M)
 #define XS_MPP(M)		M ## _mutex
-#define XS_MUTEX(M)		GStaticMutex	XS_MPP(M) = G_STATIC_MUTEX_INIT
+#define XS_MUTEX(M)		GStaticMutex XS_MPP(M) = G_STATIC_MUTEX_INIT
 #define XS_MUTEX_H(M)		extern GStaticMutex XS_MPP(M)
-#define XS_MUTEX_LOCK(M)	g_static_mutex_lock(&XS_MPP(M))
-#define XS_MUTEX_UNLOCK(M)	g_static_mutex_unlock(&XS_MPP(M))
+#ifdef XS_MUTEX_DEBUG
+#  define XS_MUTEX_LOCK(M)	{			\
+	gboolean tmpRes;				\
+	XSDEBUG("XS_MUTEX_TRYLOCK(" #M ")\n");	\
+	tmpRes = g_static_mutex_trylock(&XS_MPP(M));	\
+	XSDEBUG("[" #M "] = %s\n", tmpRes ? "TRUE" : "FALSE");	\
+	}
+#  define XS_MUTEX_UNLOCK(M)	{ XSDEBUG("XS_MUTEX_UNLOCK(" #M ")\n"); g_static_mutex_unlock(&XS_MPP(M)); }
+#else
+#  define XS_MUTEX_LOCK(M)	g_static_mutex_lock(&XS_MPP(M))
+#  define XS_MUTEX_UNLOCK(M)	g_static_mutex_unlock(&XS_MPP(M))
+#endif
 
 /* Character set conversion helper macros
  */
-#define XS_CS_SID(M)	g_convert(M, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL)
-#define XS_CS_STIL(M)	g_convert(M, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL)
+#define XS_CS_FILENAME(M)	g_filename_to_utf8(M, -1, NULL, NULL, NULL)
+#define XS_CS_SID(M)		g_convert(M, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL)
+#define XS_CS_STIL(M)		g_convert(M, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL)
+#define XS_CS_FREE(M)		g_free(M)
 
 /* Shorthands for linked lists
  */
@@ -188,19 +177,11 @@
 void	xs_pause(InputPlayback *, short);
 void	xs_seek(InputPlayback *, gint);
 gint	xs_get_time(InputPlayback *);
-void	xs_get_song_info(gchar *, gchar **, gint *);
-t_xs_tuple *xs_get_song_tuple(gchar *);
+Tuple *	xs_get_song_tuple(gchar *);
 void	xs_about(void);
 
-
-t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
-		gint nsubTunes, gint startTune, const gchar * sidName,
-		const gchar * sidComposer, const gchar * sidCopyright,
-		gint loadAddr, gint initAddr, gint playAddr,
-		gint dataFileLen, const gchar *sidFormat, gint sidModel);
-void	xs_tuneinfo_free(t_xs_tuneinfo *);
-
 void	xs_error(const char *, ...);
+gboolean xs_get_trackinfo(const gchar *, gchar **, gint *);
 
 
 /* Debugging
@@ -215,6 +196,29 @@
 #  endif
 #endif
 
+
+/* And even some Gtk+ macro crap here, yay.
+ */
+#define XS_DEF_WINDOW_DELETE(ME, MV)					\
+gboolean xs_ ## ME ## _delete(GtkWidget *w, GdkEvent *e, gpointer d) {	\
+	(void) w; (void) e; (void) d;					\
+	if (xs_ ## MV ) {						\
+		gtk_widget_destroy(xs_ ## MV );				\
+		xs_ ## MV = NULL;					\
+	}								\
+	return FALSE;							\
+}
+
+#define XS_DEF_WINDOW_CLOSE(ME, MV)			\
+void xs_ ## ME (GtkButton *b, gpointer d) {		\
+	(void) b; (void) d;				\
+	gtk_widget_destroy(xs_ ## MV );			\
+	xs_ ## MV = NULL;				\
+}
+
+#define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA)		\
+	g_signal_connect(G_OBJECT(SOBJ), SNAME, G_CALLBACK(SFUNC), SDATA)
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/sid/xs_about.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_about.c	Fri Sep 07 04:04:03 2007 -0500
@@ -51,12 +51,8 @@
 #endif
 
 
-gint xs_about_ok(void)
-{
-	gtk_widget_destroy(xs_aboutwin);
-	xs_aboutwin = NULL;
-	return 0;
-}
+XS_DEF_WINDOW_CLOSE(about_ok, aboutwin)
+XS_DEF_WINDOW_DELETE(about, aboutwin)
 
 
 /*
@@ -72,6 +68,7 @@
 	GtkWidget *about_text;
 	GtkWidget *alignment6;
 	GtkWidget *about_close;
+	gchar tmpStr[64];
 
 	/* Check if there already is an open about window */
 	if (xs_aboutwin != NULL) {
@@ -84,8 +81,11 @@
 	gtk_window_set_type_hint(GTK_WINDOW(xs_aboutwin), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_widget_set_name(xs_aboutwin, "xs_aboutwin");
 	gtk_object_set_data(GTK_OBJECT(xs_aboutwin), "xs_aboutwin", xs_aboutwin);
-	gtk_window_set_title(GTK_WINDOW(xs_aboutwin), "About " XS_PACKAGE_STRING);
-	gtk_window_set_default_size(GTK_WINDOW(xs_aboutwin), 300, -1);
+	g_snprintf(tmpStr, sizeof(tmpStr), _("About %s"), XS_PACKAGE_STRING);
+	gtk_window_set_title(GTK_WINDOW(xs_aboutwin), tmpStr);
+	gtk_window_set_default_size(GTK_WINDOW(xs_aboutwin), 350, -1);
+
+	XS_SIGNAL_CONNECT(xs_aboutwin, "delete_event", xs_about_delete, NULL);
 
 	about_vbox1 = gtk_vbox_new(FALSE, 0);
 	gtk_widget_set_name(about_vbox1, "about_vbox1");
@@ -153,6 +153,11 @@
 	gtk_text_buffer_set_text(
 	GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(about_text))),
 			"\n"
+			"This release of XMMS-SID is dedicated to\n"
+			"            Richard Joseph\n"
+			" - Now gone, but forever in our hearts -\n"
+			"\n"
+			"\n"
 			"(C) Copyright 1999-2007\n"
 			"\tTecnic Software productions (TNSP)\n"
 			"\n"
@@ -201,7 +206,7 @@
 	gtk_box_pack_start(GTK_BOX(about_vbox1), alignment6, FALSE, TRUE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(alignment6), 8);
 
-	about_close = gtk_button_new_with_label("Close");
+	about_close = gtk_button_new_with_label(_("Close"));
 	gtk_widget_set_name(about_close, "about_close");
 	gtk_widget_ref(about_close);
 	gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_close", about_close,
@@ -210,8 +215,7 @@
 	gtk_container_add(GTK_CONTAINER(alignment6), about_close);
 	GTK_WIDGET_SET_FLAGS(about_close, GTK_CAN_DEFAULT);
 
-	gtk_signal_connect(GTK_OBJECT(about_close), "clicked",
-		GTK_SIGNAL_FUNC(xs_about_ok), NULL);
+	XS_SIGNAL_CONNECT(about_close, "clicked", xs_about_ok, NULL);
 
 	gtk_widget_show(xs_aboutwin);
 }
--- a/src/sid/xs_config.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_config.c	Fri Sep 07 04:04:03 2007 -0500
@@ -54,6 +54,7 @@
 #define XS_CFG_GET_BOOL		xmms_cfg_read_boolean
 #endif
 #include <stdio.h>
+#include <ctype.h>
 #include "xs_glade.h"
 #include "xs_interface.h"
 #include "xs_support.h"
@@ -65,10 +66,21 @@
 static GtkWidget *xs_configwin = NULL,
 	*xs_sldb_fileselector = NULL,
 	*xs_stil_fileselector = NULL,
-	*xs_hvsc_pathselector = NULL;
+	*xs_hvsc_selector = NULL,
+	*xs_filt_importselector = NULL,
+	*xs_filt_exportselector = NULL;
 
 #define LUW(x)	lookup_widget(xs_configwin, x)
 
+/* Samplerates
+ */
+static const gchar *xs_samplerates_table[] = {
+	"8000", "11025", "22050", 
+	"44100", "48000", "64000",
+	"96000"
+};
+
+static const gint xs_nsamplerates_table = (sizeof(xs_samplerates_table) / sizeof(xs_samplerates_table[0]));
 
 /*
  * Configuration specific stuff
@@ -76,7 +88,7 @@
 XS_MUTEX(xs_cfg);
 struct t_xs_cfg xs_cfg;
 
-t_xs_cfg_item xs_cfgtable[] = {
+static t_xs_cfg_item xs_cfgtable[] = {
 { CTYPE_INT,	&xs_cfg.audioBitsPerSample,	"audioBitsPerSample" },
 { CTYPE_INT,	&xs_cfg.audioChannels,		"audioChannels" },
 { CTYPE_INT,	&xs_cfg.audioFrequency,		"audioFrequency" },
@@ -95,6 +107,7 @@
 
 { CTYPE_INT,	&xs_cfg.sid2Builder,		"sid2Builder" },
 { CTYPE_INT,	&xs_cfg.sid2OptLevel,		"sid2OptLevel" },
+{ CTYPE_INT,	&xs_cfg.sid2NFilterPresets,	"sid2NFilterPresets" },
 
 { CTYPE_BOOL,	&xs_cfg.oversampleEnable,	"oversampleEnable" },
 { CTYPE_INT,	&xs_cfg.oversampleFactor,	"oversampleFactor" },
@@ -111,8 +124,10 @@
 { CTYPE_STR,	&xs_cfg.stilDBPath,		"stilDBPath" },
 { CTYPE_STR,	&xs_cfg.hvscPath,		"hvscPath" },
 
+#ifndef AUDACIOUS_PLUGIN
 { CTYPE_INT,	&xs_cfg.subsongControl,		"subsongControl" },
 { CTYPE_BOOL,	&xs_cfg.detectMagic,		"detectMagic" },
+#endif
 
 { CTYPE_BOOL,	&xs_cfg.titleOverride,		"titleOverride" },
 { CTYPE_STR,	&xs_cfg.titleFormat,		"titleFormat" },
@@ -125,7 +140,7 @@
 static const gint xs_cfgtable_max = (sizeof(xs_cfgtable) / sizeof(t_xs_cfg_item));
 
 
-t_xs_wid_item xs_widtable[] = {
+static t_xs_wid_item xs_widtable[] = {
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_res_16bit",	&xs_cfg.audioBitsPerSample,	XS_RES_16BIT },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_res_8bit",		&xs_cfg.audioBitsPerSample,	XS_RES_8BIT },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_chn_mono",		&xs_cfg.audioChannels,		XS_CHN_MONO },
@@ -169,12 +184,14 @@
 { WTYPE_TEXT,	CTYPE_STR,	"cfg_stil_dbpath",	&xs_cfg.stilDBPath,		0 },
 { WTYPE_TEXT,	CTYPE_STR,	"cfg_hvsc_path",	&xs_cfg.hvscPath,		0 },
 
+#ifndef AUDACIOUS_PLUGIN
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_none",	&xs_cfg.subsongControl,		XS_SSC_NONE },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_seek",	&xs_cfg.subsongControl,		XS_SSC_SEEK },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_popup",	&xs_cfg.subsongControl,		XS_SSC_POPUP },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_patch",	&xs_cfg.subsongControl,		XS_SSC_PATCH },
 
 { WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_detectmagic",	&xs_cfg.detectMagic,		0 },
+#endif
 
 { WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_ftitle_override",	&xs_cfg.titleOverride,		0 },
 { WTYPE_TEXT,	CTYPE_STR,	"cfg_ftitle_format",	&xs_cfg.titleFormat,		0 },
@@ -195,6 +212,8 @@
 	XSDEBUG("initializing configuration ...\n");
 	XS_MUTEX_LOCK(xs_cfg);
 
+	xs_memset(&xs_cfg, 0, sizeof(xs_cfg));
+	
 	/* Initialize values with sensible defaults */
 	xs_cfg.audioBitsPerSample = XS_RES_16BIT;
 	xs_cfg.audioChannels = XS_CHN_MONO;
@@ -203,6 +222,7 @@
 	xs_cfg.mos8580 = FALSE;
 	xs_cfg.forceModel = FALSE;
 
+	/* Filter values */
 	xs_cfg.emulateFilters = TRUE;
 	xs_cfg.sid1FilterFs = XS_SIDPLAY1_FS;
 	xs_cfg.sid1FilterFm = XS_SIDPLAY1_FM;
@@ -224,6 +244,8 @@
 	xs_cfg.forceSpeed = FALSE;
 
 	xs_cfg.sid2OptLevel = 0;
+	xs_cfg.sid2NFilterPresets = 0;
+
 #ifdef HAVE_RESID_BUILDER
 	xs_cfg.sid2Builder = XS_BLD_RESID;
 #else
@@ -253,21 +275,22 @@
 	xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt");
 	xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music");
 
-#ifdef HAVE_SONG_POSITION
+#if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
 	xs_cfg.subsongControl = XS_SSC_PATCH;
 #else
 	xs_cfg.subsongControl = XS_SSC_POPUP;
 #endif
-
 	xs_cfg.detectMagic = FALSE;
 
-#if defined(HAVE_XMMSEXTRA) || defined(AUDACIOUS_PLUGIN)
-	xs_cfg.titleOverride = FALSE;
-#else
+#ifndef HAVE_XMMSEXTRA
 	xs_cfg.titleOverride = TRUE;
 #endif
-	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) [%n/%N][%m/%C]");
 
+#ifdef AUDACIOUS_PLUGIN
+	xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subtune}/${subtunes}> [${sid-model}/${sid-speed}]");
+#else
+	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) <%n/%N> [%m/%C]");
+#endif
 
 	xs_cfg.subAutoEnable = FALSE;
 	xs_cfg.subAutoMinOnly = TRUE;
@@ -292,8 +315,6 @@
 	g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter);
 	if (!XS_CFG_GET_INT(cfg, XS_CONFIG_IDENT, tmpKey, &(pResult->npoints)))
 		return FALSE;
-	if (pResult->npoints > XS_SIDPLAY2_NFPOINTS)
-		return FALSE;
 	
 	g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter);
 	if (!XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, &tmpStr))
@@ -310,9 +331,10 @@
 		return FALSE;
 	
 	for (i = 0, j = 0; i < pResult->npoints; i++, j += XS_FITEM) {
-		sscanf(&tmpStr[j], "%4x%4x",
+		if (sscanf(&tmpStr[j], "%4x%4x",
 			&(pResult->points[i].x),
-			&(pResult->points[i].y));
+			&(pResult->points[i].y)) != 2)
+			return FALSE;
 	}
 	
 	return TRUE;
@@ -370,34 +392,113 @@
 /* Filter exporting and importing. These functions export/import
  * filter settings to/from SIDPlay2 INI-type files.
  */
-static gboolean xs_filters_import(gchar *pcFilename, t_xs_sid2_filter **pFilters, gint *nFilters)
+static gboolean xs_fgetitem(gchar *inLine, size_t *linePos, gchar sep, gchar *tmpStr, size_t tmpMax)
+{
+	size_t i;
+	for (i = 0; i < tmpMax && inLine[*linePos] &&
+		!isspace(inLine[*linePos]) &&
+		inLine[*linePos] != sep; i++, (*linePos)++)
+		tmpStr[i] = inLine[*linePos];
+	tmpStr[i] = 0;
+	xs_findnext(inLine, linePos);
+	return (inLine[*linePos] == sep);
+}
+
+static gboolean xs_filters_import(const gchar *pcFilename, t_xs_sid2_filter **pFilters, gint *nFilters)
 {
 	FILE *inFile;
-	t_xs_sid2_filter *f;
+	gchar inLine[XS_BUF_SIZE], tmpStr[XS_BUF_SIZE];
+	gchar *sectName = NULL;
+	gboolean sectBegin;
+	size_t lineNum, i;
+	t_xs_sid2_filter *tmpFilter;
+
+fprintf(stderr, "xs_filters_import(%s)\n", pcFilename);
+
+	if ((inFile = fopen(pcFilename, "ra")) == NULL)
+		return FALSE;
+
+fprintf(stderr, "importing...\n");
 	
-	if ((inFile = fopen(pcFilename, "rb")) == NULL)
-		return FALSE;
-	
-	
+	sectBegin = FALSE;
+	lineNum = 0;
+	while (fgets(inLine, XS_BUF_SIZE, inFile) != NULL) {
+		size_t linePos = 0;
+		lineNum++;
+		
+		xs_findnext(inLine, &linePos);
+		if (isalpha(inLine[linePos]) && sectBegin) {
+			/* A new key/value pair */
+			if (!xs_fgetitem(inLine, &linePos, '=', tmpStr, XS_BUF_SIZE)) {
+				fprintf(stderr, "invalid line: %s [expect =']'", inLine);
+			} else {
+				linePos++;
+				xs_findnext(inLine, &linePos);
+				if (!strncmp(tmpStr, "points", 6)) {
+					fprintf(stderr, "points=%s\n", &inLine[linePos]);
+				} else if (!strncmp(tmpStr, "point", 5)) {
+				} else if (!strncmp(tmpStr, "type", 4)) {
+				} else {
+					fprintf(stderr, "warning: ukn def: %s @ %s\n",
+						tmpStr, sectName);
+				}
+			}
+		} else if (inLine[linePos] == '[') {
+			/* Check for existing section */
+			if (sectBegin) {
+				/* Submit definition */
+				fprintf(stderr, "filter ends: %s\n", sectName);
+				if ((tmpFilter = g_malloc0(sizeof(t_xs_sid2_filter))) == NULL) {
+					fprintf(stderr, "could not allocate ..\n");
+				} else {
+					
+				}
+				g_free(sectName);
+			}
+			
+			/* New filter(?) section starts */
+			linePos++;
+			for (i = 0; i < XS_BUF_SIZE && inLine[linePos] && inLine[linePos] != ']'; i++, linePos++)
+				tmpStr[i] = inLine[linePos];
+			tmpStr[i] = 0;
+			
+			if (inLine[linePos] != ']') {
+				fprintf(stderr, "invalid! expected ']': %s\n", inLine);
+			} else {
+				sectName = strdup(tmpStr);
+				fprintf(stderr, "filter: %s\n", sectName);
+				sectBegin = TRUE;
+			}
+		} else if ((inLine[linePos] != ';') && (inLine[linePos] != 0)) {
+			/* Syntax error */
+			fprintf(stderr, "syntax error: %s\n", inLine);
+		}
+	}
 	
 	fclose(inFile);
-	return FALSE;
+	return TRUE;
 }
 
 
-static gboolean xs_filters_export(gchar *pcFilename, t_xs_sid2_filter *pFilters, gint nFilters)
+static gboolean xs_filters_export(const gchar *pcFilename, t_xs_sid2_filter **pFilters, gint nFilters)
 {
 	FILE *outFile;
-	t_xs_sid2_filter *f = pFilters;
+	t_xs_sid2_filter *f;
 	gint n;
 	
 	/* Open/create the file */
-	if ((outFile = fopen(pcFilename, "wb")) == NULL)
+	if ((outFile = fopen(pcFilename, "wa")) == NULL)
 		return FALSE;
 	
+	/* Header */
+	fprintf(outFile,
+		"; SIDPlay2 compatible filter definition file\n"
+		"; Exported by " PACKAGE_STRING "\n\n");
+	
 	/* Write each filter spec in "INI"-style format */
 	for (n = 0; n < nFilters; n++) {
 		gint i;
+		f = pFilters[n];
 		
 		fprintf(outFile,
 		"[%s]\n"
@@ -473,6 +574,20 @@
 		}
 	}
 	
+	/* Filters and presets are a special case */
+	xs_filter_load_into(cfg, 0, &xs_cfg.sid2Filter);
+	
+	if (xs_cfg.sid2NFilterPresets > 0) {
+		xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(t_xs_sid2_filter *));
+		if (!xs_cfg.sid2FilterPresets) {
+			xs_error(_("Allocation of sid2FilterPresets structure failed!\n"));
+		} else {
+			for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) {
+				xs_cfg.sid2FilterPresets[i] = xs_filter_load(cfg, i);
+			}
+		}
+	}
+
 	XS_CONFIG_FREE(cfg);
 
 	XS_MUTEX_UNLOCK(xs_cfg);
@@ -495,6 +610,7 @@
 
 #ifndef AUDACIOUS_PLUGIN
 	if (!cfg) cfg = xmms_cfg_new();
+	if (!cfg) return -1;
 #endif
 
 	/* Write the new settings to XMMS configuration file */
@@ -526,6 +642,7 @@
 		}
 	}
 
+
 	XS_CONFIG_WRITE(cfg);
 	XS_CONFIG_FREE(cfg);
 
@@ -537,11 +654,7 @@
 
 /* Configuration panel was canceled
  */
-void xs_cfg_cancel(void)
-{
-	gtk_widget_destroy(xs_configwin);
-	xs_configwin = NULL;
-}
+XS_DEF_WINDOW_CLOSE(cfg_cancel, configwin)
 
 
 /* Configuration was accepted, save the settings
@@ -551,7 +664,7 @@
 	gint i;
 	gfloat tmpValue;
 	gint tmpInt;
-	gchar *tmpStr;
+	const gchar *tmpStr;
 
 	/* Get lock on configuration */
 	XS_MUTEX_LOCK(xs_cfg);
@@ -619,6 +732,13 @@
 			break;
 		}
 	}
+	
+	/* Get filter settings */
+	/*
+	if (!xs_curve_get_points(XS_CURVE(LUW("")), &xs_cfg.sid2Filter.points, &xs_cfg.sid2Filter.npoints)) {
+		xs_error(_("Warning: Could not get filter curve widget points!\n"));
+	}
+	*/
 
 	/* Release lock */
 	XS_MUTEX_UNLOCK(xs_cfg);
@@ -635,22 +755,9 @@
 }
 
 
-/* Reset filter settings to defaults
- */
-void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data)
-{
-	(void) button;
-	(void) user_data;
-
-	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fs"))), XS_SIDPLAY1_FS);
-	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fm"))), XS_SIDPLAY1_FM);
-	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_ft"))), XS_SIDPLAY1_FT);
-}
-
-
 /* HVSC songlength-database file selector response-functions
  */
-void xs_cfg_sld_dbbrowse(GtkButton * button, gpointer user_data)
+void xs_cfg_sldb_browse(GtkButton * button, gpointer user_data)
 {
 	(void) button;
 	(void) user_data;
@@ -660,7 +767,7 @@
 		return;
 	}
 
-	xs_sldb_fileselector = create_xs_sldbfileselector();
+	xs_sldb_fileselector = create_xs_sldb_fs();
 	XS_MUTEX_LOCK(xs_cfg);
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_sldb_fileselector), xs_cfg.songlenDBPath);
 	XS_MUTEX_UNLOCK(xs_cfg);
@@ -668,8 +775,11 @@
 }
 
 
-void xs_cfg_sldb_fs_ok(void)
+void xs_sldb_fs_ok(GtkButton *button, gpointer user_data)
 {
+	(void) button;
+	(void) user_data;
+	
 	/* Selection was accepted! */
 	gtk_entry_set_text(GTK_ENTRY(LUW("cfg_sld_dbpath")),
 			   gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_sldb_fileselector)));
@@ -679,13 +789,8 @@
 	xs_sldb_fileselector = NULL;
 }
 
-
-void xs_cfg_sldb_fs_cancel(void)
-{
-	/* Close file selector window */
-	gtk_widget_destroy(xs_sldb_fileselector);
-	xs_sldb_fileselector = NULL;
-}
+XS_DEF_WINDOW_CLOSE(sldb_fs_cancel, sldb_fileselector)
+XS_DEF_WINDOW_DELETE(sldb_fs, sldb_fileselector)
 
 
 /* STIL-database file selector response-functions
@@ -700,7 +805,7 @@
 		return;
 	}
 
-	xs_stil_fileselector = create_xs_stilfileselector();
+	xs_stil_fileselector = create_xs_stil_fs();
 	XS_MUTEX_LOCK(xs_cfg);
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_stil_fileselector), xs_cfg.stilDBPath);
 	XS_MUTEX_UNLOCK(xs_cfg);
@@ -708,11 +813,14 @@
 }
 
 
-void xs_cfg_stil_fs_ok(void)
+void xs_stil_fs_ok(GtkButton *button, gpointer user_data)
 {
+	(void) button;
+	(void) user_data;
+
 	/* Selection was accepted! */
 	gtk_entry_set_text(GTK_ENTRY(LUW("cfg_stil_dbpath")),
-			   gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_stil_fileselector)));
+		gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_stil_fileselector)));
 
 	/* Close file selector window */
 	gtk_widget_destroy(xs_stil_fileselector);
@@ -720,12 +828,8 @@
 }
 
 
-void xs_cfg_stil_fs_cancel(void)
-{
-	/* Close file selector window */
-	gtk_widget_destroy(xs_stil_fileselector);
-	xs_stil_fileselector = NULL;
-}
+XS_DEF_WINDOW_CLOSE(stil_fs_cancel, stil_fileselector)
+XS_DEF_WINDOW_DELETE(stil_fs, stil_fileselector)
 
 
 /* HVSC location selector response-functions
@@ -735,39 +839,237 @@
 	(void) button;
 	(void) user_data;
 
-	if (xs_hvsc_pathselector != NULL) {
-		gdk_window_raise(xs_hvsc_pathselector->window);
+	if (xs_hvsc_selector != NULL) {
+		gdk_window_raise(xs_hvsc_selector->window);
 		return;
 	}
 
-	xs_hvsc_pathselector = create_xs_hvscpathselector();
+	xs_hvsc_selector = create_xs_hvsc_fs();
 	XS_MUTEX_LOCK(xs_cfg);
-	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_hvsc_pathselector), xs_cfg.hvscPath);
+	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_hvsc_selector), xs_cfg.hvscPath);
 	XS_MUTEX_UNLOCK(xs_cfg);
-	gtk_widget_show(xs_hvsc_pathselector);
+	gtk_widget_show(xs_hvsc_selector);
+}
+
+
+void xs_hvsc_fs_ok(GtkButton *button, gpointer user_data)
+{
+	(void) button;
+	(void) user_data;
+
+	/* Selection was accepted! */
+	gtk_entry_set_text(GTK_ENTRY(LUW("cfg_hvsc_path")),
+		gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_hvsc_selector)));
+
+	/* Close file selector window */
+	gtk_widget_destroy(xs_hvsc_selector);
+	xs_hvsc_selector = NULL;
+}
+
+
+XS_DEF_WINDOW_CLOSE(hvsc_fs_cancel, hvsc_selector)
+XS_DEF_WINDOW_DELETE(hvsc_fs, hvsc_selector)
+
+
+/* Filter handling
+ */
+void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data)
+{
+	(void) button;
+	(void) user_data;
+
+	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fs"))), XS_SIDPLAY1_FS);
+	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fm"))), XS_SIDPLAY1_FM);
+	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_ft"))), XS_SIDPLAY1_FT);
+}
+
+
+void xs_cfg_sp2_filter_update(XSCurve *curve, t_xs_sid2_filter *f)
+{
+	assert(curve);
+	assert(f);
+	
+	xs_curve_reset(curve);
+	xs_curve_set_range(curve, 0,0, XS_SIDPLAY2_NFPOINTS, XS_SIDPLAY2_FMAX);
+	if (!xs_curve_set_points(curve, f->points, f->npoints)) {
+		// FIXME
+		xs_error(_("Warning: Could not set filter curve widget points!\n"));
+	}
+}
+
+
+void xs_cfg_sp2_presets_update(void)
+{
+	GList *tmpList = NULL;
+	gint i;
+	
+	for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) {
+		tmpList = g_list_append(tmpList,
+			(gpointer) xs_cfg.sid2FilterPresets[i]->name);
+	}
+	
+	gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_sp2_filter_combo")), tmpList);
+	g_list_free(tmpList);
+}
+
+
+void xs_cfg_sp2_filter_load(GtkButton *button, gpointer user_data)
+{
+	const gchar *tmpStr;
+	gint i, j;
+	
+	(void) button;
+	(void) user_data;
+	
+	XS_MUTEX_LOCK(xs_cfg);
+	
+	tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry")));
+	for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) {
+		if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) {
+			j = i;
+			break;
+		}
+	}
+	
+	if (j != -1) {
+		fprintf(stderr, "Updating from '%s'\n", tmpStr);
+		xs_cfg_sp2_filter_update(
+			XS_CURVE(LUW("cfg_sp2_filter_curve")),
+			xs_cfg.sid2FilterPresets[i]);
+	} else {
+		/* error/warning: no such filter preset */
+		fprintf(stderr, "No such filter preset '%s'!\n", tmpStr);
+	}
+	
+	XS_MUTEX_UNLOCK(xs_cfg);
 }
 
 
-void xs_cfg_hvsc_fs_ok(void)
+void xs_cfg_sp2_filter_save(GtkButton *button, gpointer user_data)
 {
-	/* Selection was accepted! */
-	gtk_entry_set_text(GTK_ENTRY(LUW("cfg_hvsc_path")),
-			   gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_hvsc_pathselector)));
+	/*
+	1) check if textentry matches any current filter name
+		yes) ask if saving over ok?
+		no) ...
+		
+	2) save current filter to the name		
+	*/
+	const gchar *tmpStr;
+	gint i, j;
+	
+	(void) button;
+	(void) user_data;
+	
+	XS_MUTEX_LOCK(xs_cfg);
+	
+	tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry")));
+	for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) {
+		if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) {
+			j = i;
+			break;
+		}
+	}
+	
+	if (j != -1) {
+		fprintf(stderr, "Found, confirm overwrite?\n");
+	}
+	
+	fprintf(stderr, "saving!\n");
+	
+	xs_cfg_sp2_presets_update();
+	
+	XS_MUTEX_UNLOCK(xs_cfg);
+}
 
-	/* Close file selector window */
-	gtk_widget_destroy(xs_hvsc_pathselector);
-	xs_hvsc_pathselector = NULL;
+
+void xs_cfg_sp2_filter_delete(GtkButton *button, gpointer user_data)
+{
+	(void) button;
+	(void) user_data;
+	/*
+	1) confirm
+	2) delete
+	*/
 }
 
 
-void xs_cfg_hvsc_fs_cancel(void)
+void xs_cfg_sp2_filter_import(GtkButton *button, gpointer user_data)
 {
+	(void) button;
+	(void) user_data;
+
+	if (xs_filt_importselector != NULL) {
+		gdk_window_raise(xs_filt_importselector->window);
+		return;
+	}
+
+	xs_filt_importselector = create_xs_filter_import_fs();
+	gtk_widget_show(xs_filt_importselector);
+}
+
+
+void xs_filter_import_fs_ok(GtkButton *button, gpointer user_data)
+{
+	const gchar *tmpStr;
+	(void) button;
+	(void) user_data;
+	
+	XS_MUTEX_LOCK(xs_cfg);
+
+	/* Selection was accepted! */
+	tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_importselector));
+	xs_filters_import(tmpStr, xs_cfg.sid2FilterPresets, &xs_cfg.sid2NFilterPresets);
+	xs_cfg_sp2_presets_update();
+
 	/* Close file selector window */
-	gtk_widget_destroy(xs_hvsc_pathselector);
-	xs_hvsc_pathselector = NULL;
+	gtk_widget_destroy(xs_filt_importselector);
+	xs_filt_importselector = NULL;
+	XS_MUTEX_UNLOCK(xs_cfg);
+}
+
+
+XS_DEF_WINDOW_CLOSE(filter_import_fs_cancel, filt_importselector)
+XS_DEF_WINDOW_DELETE(filter_import_fs, filt_importselector)
+
+
+void xs_cfg_sp2_filter_export(GtkButton *button, gpointer user_data)
+{
+	(void) button;
+	(void) user_data;
+
+	if (xs_filt_exportselector != NULL) {
+		gdk_window_raise(xs_filt_exportselector->window);
+		return;
+	}
+
+	xs_filt_exportselector = create_xs_filter_export_fs();
+	gtk_widget_show(xs_filt_exportselector);
 }
 
 
+void xs_filter_export_fs_ok(GtkButton *button, gpointer user_data)
+{
+	const gchar *tmpStr;
+	(void) button;
+	(void) user_data;
+
+	XS_MUTEX_LOCK(xs_cfg);
+
+	/* Selection was accepted! */
+	tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_exportselector));
+	xs_filters_export(tmpStr, xs_cfg.sid2FilterPresets, xs_cfg.sid2NFilterPresets);
+
+	/* Close file selector window */
+	gtk_widget_destroy(xs_filt_exportselector);
+	xs_filt_exportselector = NULL;
+	XS_MUTEX_UNLOCK(xs_cfg);
+}
+
+
+XS_DEF_WINDOW_CLOSE(filter_export_fs_cancel, filt_exportselector)
+XS_DEF_WINDOW_DELETE(filter_export_fs, filt_exportselector)
+
+
 /* Selection toggle handlers
  */
 void xs_cfg_emu_filters_toggled(GtkToggleButton * togglebutton, gpointer user_data)
@@ -856,7 +1158,7 @@
 }
 
 
-void xs_cfg_sld_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
+void xs_cfg_sldb_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
 {
 	gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
 
@@ -931,81 +1233,84 @@
 }
 
 
+XS_DEF_WINDOW_DELETE(configwin, configwin)
+
+
 /* Execute the configuration panel
  */
 void xs_configure(void)
 {
 	gint i;
 	gfloat tmpValue;
-	gchar tmpStr[32];
-	GtkWidget *c;
+	gchar tmpStr[64];
+	GList *tmpList = NULL;
+	GtkWidget *tmpCurve;
 
 	/* Check if the window already exists */
-	if (xs_configwin != NULL) {
+	if (xs_configwin) {
 		gdk_window_raise(xs_configwin->window);
 		return;
 	}
 
 	/* Create the window */
 	xs_configwin = create_xs_configwin();
-
+	
 	/* Get lock on configuration */
 	XS_MUTEX_LOCK(xs_cfg);
 
+	/* Add samplerates */
+	for (i = 0; i < xs_nsamplerates_table; i++) {
+		tmpList = g_list_append (tmpList,
+			(gpointer) xs_samplerates_table[i]);
+	}
+	gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_samplerate_combo")), tmpList);
+	g_list_free(tmpList);
+	
 	/* Create the custom filter curve widget for libSIDPlay2 */
-	c = xs_curve_new();
-	xs_curve_reset(XS_CURVE(c));
-	xs_curve_set_range(XS_CURVE(c),
-		0,0, XS_SIDPLAY2_NFPOINTS, XS_SIDPLAY2_FMAX);
-	xs_curve_set_points(XS_CURVE(c),
-		xs_cfg.sid2Filter.points, xs_cfg.sid2Filter.npoints);
-	
-	gtk_widget_set_name(c, "cfg_sp2_filter_curve");
-	gtk_widget_ref(c);
+	xs_cfg_sp2_presets_update();
+	tmpCurve = xs_curve_new();
+	xs_cfg_sp2_filter_update(XS_CURVE(tmpCurve), &xs_cfg.sid2Filter);
+	gtk_widget_set_name(tmpCurve, "cfg_sp2_filter_curve");
+	gtk_widget_ref(tmpCurve);
 	gtk_object_set_data_full(GTK_OBJECT(xs_configwin),
-		"cfg_sp2_filter_curve", c, (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show(c);
-	gtk_container_add(GTK_CONTAINER(LUW("cfg_sp2_filter_frame")), c);
+		"cfg_sp2_filter_curve", tmpCurve, (GtkDestroyNotify) gtk_widget_unref);
+	gtk_widget_show(tmpCurve);
+	gtk_container_add(GTK_CONTAINER(LUW("cfg_sp2_filter_frame")), tmpCurve);
 
 
 	/* Based on available optional parts, gray out options */
 #ifndef HAVE_SIDPLAY1
 	gtk_widget_set_sensitive(LUW("cfg_emu_sidplay1"), FALSE);
-	gtk_widget_set_sensitive(LUW("cfg_box_sidplay1"), FALSE);
+	gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay1"), FALSE);
 #endif
 
 #ifndef HAVE_SIDPLAY2
 	gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE);
-	gtk_widget_set_sensitive(LUW("cfg_box_sidplay2"), FALSE);
+	gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE);
 #endif
 
+	gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
+
 #if !defined(HAVE_XMMSEXTRA) && !defined(AUDACIOUS_PLUGIN)
 	gtk_widget_set_sensitive(LUW("cfg_ftitle_override"), FALSE);
 	xs_cfg.titleOverride = TRUE;
 #endif
 
-#ifndef HAVE_SONG_POSITION
+#if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
 	gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE);
 #endif
 
-#ifdef AUDACIOUS_PLUGIN
-	gtk_widget_set_sensitive(LUW("cfg_detectmagic"), FALSE);
-#endif
-
-	/* Update the widget sensitivities */
-	gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
-		
-	xs_cfg_emu_filters_toggled((GtkToggleButton *) LUW("cfg_emu_filters"), NULL);
-	xs_cfg_ftitle_override_toggled((GtkToggleButton *) LUW("cfg_ftitle_override"), NULL);
-	xs_cfg_emu_sidplay1_toggled((GtkToggleButton *) LUW("cfg_emu_sidplay1"), NULL);
-	xs_cfg_emu_sidplay2_toggled((GtkToggleButton *) LUW("cfg_emu_sidplay2"), NULL);
-	xs_cfg_oversample_toggled((GtkToggleButton *) LUW("cfg_oversample"), NULL);
-	xs_cfg_mintime_enable_toggled((GtkToggleButton *) LUW("cfg_mintime_enable"), NULL);
-	xs_cfg_maxtime_enable_toggled((GtkToggleButton *) LUW("cfg_maxtime_enable"), NULL);
-	xs_cfg_sld_enable_toggled((GtkToggleButton *) LUW("cfg_sld_enable"), NULL);
-	xs_cfg_stil_enable_toggled((GtkToggleButton *) LUW("cfg_stil_enable"), NULL);
-	xs_cfg_subauto_enable_toggled((GtkToggleButton *) LUW("cfg_subauto_enable"), NULL);
-	xs_cfg_subauto_min_only_toggled((GtkToggleButton *) LUW("cfg_subauto_min_only"), NULL);
+	xs_cfg_ftitle_override_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_ftitle_override")), NULL);
+	xs_cfg_emu_filters_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_filters")), NULL);
+	xs_cfg_emu_sidplay1_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay1")), NULL);
+	xs_cfg_emu_sidplay2_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2")), NULL);
+	xs_cfg_oversample_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_oversample")), NULL);
+	xs_cfg_mintime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_mintime_enable")), NULL);
+	xs_cfg_maxtime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable")), NULL);
+	xs_cfg_sldb_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_sld_enable")), NULL);
+	xs_cfg_stil_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_stil_enable")), NULL);
+	xs_cfg_subauto_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable")), NULL);
+	xs_cfg_subauto_min_only_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_min_only")), NULL);
 
 
 	/* Set current data to widgets */
--- a/src/sid/xs_curve.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_curve.c	Fri Sep 07 04:04:03 2007 -0500
@@ -145,18 +145,16 @@
 {
 	gint old_mask;
 
-	curve->cursor_type = GDK_TOP_LEFT_ARROW;
 	curve->pixmap = NULL;
-	curve->height = 0;
 	curve->grab_point = -1;
 
 	curve->nctlpoints = 0;
 	curve->ctlpoints = NULL;
 
 	curve->min_x = 0.0;
-	curve->max_x = 1.0;
+	curve->max_x = 2047.0;
 	curve->min_y = 0.0;
-	curve->max_y = 1.0;
+	curve->max_y = 24000.0;
 
 	old_mask = gtk_widget_get_events(GTK_WIDGET(curve));
 	gtk_widget_set_events(GTK_WIDGET(curve), old_mask | GRAPH_MASK);
@@ -250,10 +248,10 @@
 
 static void xs_curve_draw(XSCurve *curve, gint width, gint height)
 {
-	gfloat res = 10.0f;
+	gfloat res = 5.0f;
 	GtkStateType state;
 	GtkStyle *style;
-	gint i;
+	gint i, ox = -1, oy = -1;
 	t_xs_point *p0, *p1, *p2, *p3;
 
 	if (!curve->pixmap)
@@ -285,8 +283,6 @@
 			i * (width / 4.0) + RADIUS, height + RADIUS);
 	}
 
-#define Qprintf(x,y,...)
-
 #if 1
 	/* Draw the spline/curve itself */
 	p0 = curve->ctlpoints;
@@ -295,65 +291,49 @@
 	p3 = p2; p3++;
 
 	/* Draw each curve segment */
-	Qprintf(stderr, "-- npoints = %d\n", curve->nctlpoints);
 	if (curve->nctlpoints > 5)
 	for (i = 0; i < curve->nctlpoints; i++, ++p0, ++p1, ++p2, ++p3) {
+		gint n;
 		gfloat k1, k2, a, b, c, d, x;
 		
-		Qprintf(stderr, "#%d: ", i);
 		if (p1->x == p2->x)
 			continue;
-#define PPASK(q, p) Qprintf(stderr, q "=[%1.3f, %1.3f]  ", p->x, p->y)
 
-		PPASK("p0", p1);
-		PPASK("p1", p1);
-		PPASK("p2", p2);
-		PPASK("p3", p3);
-		
-		Qprintf(stderr, "\ncase #");
 		if (p0->x == p1->x && p2->x == p3->x) {
-			Qprintf(stderr, "1");
 			k1 = k2 = (p2->y - p1->y) / (p2->x - p1->x);
 		} else if (p0->x == p1->x) {
-			Qprintf(stderr, "2");
 			k2 = (p3->y - p1->y) / (p3->x - p1->x);
 			k1 = (3 * (p2->y - p1->y) / (p2->x - p1->x) - k2) / 2;
 		} else if (p2->x == p3->x) {
-			Qprintf(stderr, "3");
 			k1 = (p2->y - p0->y) / (p2->x - p0->x);
 			k2 = (3 * (p2->y - p1->y) / (p2->x - p1->x) - k1) / 2;
 		} else {
-			Qprintf(stderr, "4");
 			k1 = (p2->y - p0->y) / (p2->x - p0->x);
 			k2 = (p3->y - p1->y) / (p3->x - p1->x);
 		}
 
 		xs_cubic_coeff(p1->x, p1->y, p2->x, p2->y, k1, k2, &a, &b, &c, &d);
 
-		Qprintf(stderr, " seg[%1.3f, %1.3f] => [%1.3f, %1.3f] k1=%1.3f, k2=%1.3f\n\n",
-			p1->x, p1->y,
-			p2->x, p2->y,
-			k1, k2);
-
-		for (x = p1->x; x <= p2->x; x += res) {
+		for (x = p1->x; x <= p2->x; x += res, n++) {
 			gfloat y = ((a * x + b) * x + c) * x + d;
 			gint qx, qy;
 			qx = RADIUS + xs_project(x, curve->min_x, curve->max_x, width);
 			qy = RADIUS + xs_project(y, curve->min_y, curve->max_y, height);
-
-			gdk_draw_point(curve->pixmap, style->fg_gc[state],
-				RADIUS + xs_project(x, curve->min_x, curve->max_x, width),
-				RADIUS + xs_project(y, curve->min_y, curve->max_y, height));
-
+			
+			if (ox != -1) {
+				gdk_draw_line(curve->pixmap, style->fg_gc[state],
+					ox, oy, qx, qy);
+			}
+			ox = qx; oy = qy;
 		}
 	}
 
-	Qprintf(stderr, "-------\n");
 #endif
 
 	/* Draw control points */
 	for (i = 0; i < curve->nctlpoints; ++i) {
 		gint x, y;
+		GtkStateType cstate;
 
 		if (GET_X(i) < curve->min_x || GET_Y(i) < curve->min_y ||
 			GET_X(i) >= curve->max_x || GET_Y(i) >= curve->max_y)
@@ -361,8 +341,17 @@
 
 		x = xs_project(GET_X(i), curve->min_x, curve->max_x, width);
 		y = xs_project(GET_Y(i), curve->min_y, curve->max_y, height);
-
-		gdk_draw_arc(curve->pixmap, style->fg_gc[state], TRUE,
+		
+		if (i == curve->grab_point) {
+			cstate = GTK_STATE_SELECTED;
+			gdk_draw_line(curve->pixmap, style->fg_gc[cstate],
+				x + RADIUS, RADIUS, x + RADIUS, height + RADIUS);
+			gdk_draw_line(curve->pixmap, style->fg_gc[cstate],
+				RADIUS, y + RADIUS, width + RADIUS, y + RADIUS);
+		} else
+			cstate = state;
+		
+		gdk_draw_arc(curve->pixmap, style->fg_gc[cstate], TRUE,
 			x, y, RADIUS2, RADIUS2, 0, 360 * 64);
 	}
 	
@@ -485,6 +474,7 @@
 		new_type = GDK_FLEUR;
 		curve->grab_point = -1;
 		}
+		xs_curve_draw(curve, width, height);
 		break;
 
 	case GDK_MOTION_NOTIFY:
@@ -709,6 +699,7 @@
 {
 	XSCurve *curve;
 
+	g_return_if_fail(object != NULL);
 	g_return_if_fail(XS_IS_CURVE(object));
 
 	curve = XS_CURVE(object);
--- a/src/sid/xs_curve.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_curve.h	Fri Sep 07 04:04:03 2007 -0500
@@ -38,9 +38,7 @@
 	gfloat min_y;
 	gfloat max_y;
 	GdkPixmap *pixmap;
-	gint height;		/* (cached) graph height in pixels */
 	gint grab_point;	/* point currently grabbed */
-	gint last;
 
 	/* control points */
 	gint nctlpoints;	/* number of control points */
--- a/src/sid/xs_fileinfo.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_fileinfo.c	Fri Sep 07 04:04:03 2007 -0500
@@ -26,14 +26,11 @@
 #include "xs_fileinfo.h"
 #include "xs_player.h"
 #include "xs_support.h"
-#include "xs_stil.h"
 #include "xs_config.h"
 #include "xs_interface.h"
 #include "xs_glade.h"
-
+#include "xs_slsup.h"
 
-static t_xs_stildb *xs_stildb_db = NULL;
-XS_MUTEX(xs_stildb_db);
 
 static GtkWidget *xs_fileinfowin = NULL;
 static t_xs_stil_node *xs_fileinfostil = NULL;
@@ -42,101 +39,7 @@
 #define LUW(x)	lookup_widget(xs_fileinfowin, x)
 
 
-/* STIL-database handling
- */
-gint xs_stil_init(void)
-{
-	XS_MUTEX_LOCK(xs_cfg);
-
-	if (!xs_cfg.stilDBPath) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		return -1;
-	}
-
-	XS_MUTEX_LOCK(xs_stildb_db);
-
-	/* Check if already initialized */
-	if (xs_stildb_db)
-		xs_stildb_free(xs_stildb_db);
-
-	/* Allocate database */
-	xs_stildb_db = (t_xs_stildb *) g_malloc0(sizeof(t_xs_stildb));
-	if (!xs_stildb_db) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_stildb_db);
-		return -2;
-	}
-
-	/* Read the database */
-	if (xs_stildb_read(xs_stildb_db, xs_cfg.stilDBPath) != 0) {
-		xs_stildb_free(xs_stildb_db);
-		xs_stildb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_stildb_db);
-		return -3;
-	}
-
-	/* Create index */
-	if (xs_stildb_index(xs_stildb_db) != 0) {
-		xs_stildb_free(xs_stildb_db);
-		xs_stildb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_stildb_db);
-		return -4;
-	}
-
-	XS_MUTEX_UNLOCK(xs_cfg);
-	XS_MUTEX_UNLOCK(xs_stildb_db);
-	return 0;
-}
-
-
-void xs_stil_close(void)
-{
-	XS_MUTEX_LOCK(xs_stildb_db);
-	xs_stildb_free(xs_stildb_db);
-	xs_stildb_db = NULL;
-	XS_MUTEX_UNLOCK(xs_stildb_db);
-}
-
-
-t_xs_stil_node *xs_stil_get(gchar *pcFilename)
-{
-	t_xs_stil_node *pResult;
-	gchar *tmpFilename;
-
-	XS_MUTEX_LOCK(xs_stildb_db);
-	XS_MUTEX_LOCK(xs_cfg);
-
-	if (xs_cfg.stilDBEnable && xs_stildb_db) {
-		if (xs_cfg.hvscPath) {
-			/* Remove postfixed directory separator from HVSC-path */
-			tmpFilename = xs_strrchr(xs_cfg.hvscPath, '/');
-			if (tmpFilename && (tmpFilename[1] == 0))
-				tmpFilename[0] = 0;
-
-			/* Remove HVSC location-prefix from filename */
-			tmpFilename = strstr(pcFilename, xs_cfg.hvscPath);
-			if (tmpFilename)
-				tmpFilename += strlen(xs_cfg.hvscPath);
-			else
-				tmpFilename = pcFilename;
-		} else
-			tmpFilename = pcFilename;
-
-XSDEBUG("xs_stil_get('%s') = '%s'\n", pcFilename, tmpFilename);
-		
-		pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
-	} else
-		pResult = NULL;
-
-	XS_MUTEX_UNLOCK(xs_stildb_db);
-	XS_MUTEX_UNLOCK(xs_cfg);
-
-	return pResult;
-}
-
-
+#ifndef AUDACIOUS_PLUGIN
 void xs_fileinfo_update(void)
 {
 	XS_MUTEX_LOCK(xs_status);
@@ -189,6 +92,7 @@
 	XS_MUTEX_UNLOCK(xs_fileinfowin);
 	XS_MUTEX_UNLOCK(xs_status);
 }
+#endif /* AUDACIOUS_PLUGIN */
 
 
 void xs_fileinfo_ok(void)
@@ -218,7 +122,6 @@
 {
 	t_xs_stil_subnode *tmpNode;
 	GtkWidget *tmpText;
-	gint tmpIndex;
 	gchar *subName, *subAuthor, *subInfo;
 
 	(void) widget;
@@ -226,17 +129,22 @@
 
 	/* Freeze text-widget and delete the old text */
 	tmpText = LUW("fileinfo_sub_info");
+#ifndef AUDACIOUS_PLUGIN
+	gtk_text_freeze(GTK_TEXT(tmpText));
+	gtk_text_set_point(GTK_TEXT(tmpText), 0);
+	gtk_text_forward_delete(GTK_TEXT(tmpText), gtk_text_get_length(GTK_TEXT(tmpText)));
+#endif
 
 	/* Get subtune information */
-	tmpIndex = g_list_index(GTK_MENU_SHELL(data)->children, gtk_menu_get_active(GTK_MENU(data)));
-	
-	if (xs_fileinfostil && tmpIndex <= xs_fileinfostil->nsubTunes)
-		tmpNode = xs_fileinfostil->subTunes[tmpIndex];
-	else
-		tmpNode = NULL;
+	tmpNode = (t_xs_stil_subnode *) data;
+	if (!tmpNode && xs_fileinfostil)
+		tmpNode = xs_fileinfostil->subTunes[0];
 	
 	if (tmpNode) {
-		subName = tmpNode->pName;
+		if (tmpNode->pName)
+			subName = tmpNode->pName;
+		else
+			subName = tmpNode->pTitle;
 		subAuthor = tmpNode->pAuthor;
 		subInfo = tmpNode->pInfo;
 	} else {
@@ -248,8 +156,17 @@
 	/* Get and set subtune information */
 	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_sub_name")), subName ? subName : "");
 	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_sub_author")), subAuthor ? subAuthor : "");
+
+#ifdef AUDACIOUS_PLUGIN
 	gtk_text_buffer_set_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmpText))),
 		subInfo ? subInfo : "", -1);
+#else
+	gtk_text_insert(GTK_TEXT(tmpText), NULL, NULL, NULL,
+		subInfo ? subInfo : "", -1);
+
+	/* Un-freeze the widget */
+	gtk_text_thaw(GTK_TEXT(tmpText));
+#endif
 }
 
 
@@ -257,33 +174,44 @@
 {
 	GtkWidget *tmpMenuItem, *tmpMenu, *tmpOptionMenu;
 	t_xs_tuneinfo *tmpInfo;
-	gchar tmpStr[256], *tmpStr2;
+	t_xs_stil_subnode *tmpNode;
+	gchar tmpStr[256], *tmpFilename;
 	gint n;
 
 	/* Current implementation leaves old fileinfo window untouched if
 	 * no information can be found for the new file. Hmm...
 	 */
+#ifdef AUDACIOUS_PLUGIN
+	xs_get_trackinfo(pcFilename, &tmpFilename, &n);
+#else
+	tmpFilename = pcFilename;
+#endif	
 
 	/* Get new tune information */
 	XS_MUTEX_LOCK(xs_fileinfowin);
 	XS_MUTEX_LOCK(xs_status);
-	if ((tmpInfo = xs_status.sidPlayer->plrGetSIDInfo(pcFilename)) == NULL) {
+	if ((tmpInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename)) == NULL) {
 		XS_MUTEX_UNLOCK(xs_fileinfowin);
 		XS_MUTEX_UNLOCK(xs_status);
 		return;
 	}
 	XS_MUTEX_UNLOCK(xs_status);
 
-	xs_fileinfostil = xs_stil_get(pcFilename);
+	xs_fileinfostil = xs_stil_get(tmpFilename);
+
+#ifdef AUDACIOUS_PLUGIN
+	g_free(tmpFilename);
+#endif
 
 	/* Check if there already is an open fileinfo window */
 	if (xs_fileinfowin)
 		gdk_window_raise(xs_fileinfowin->window);
 	else {
 		xs_fileinfowin = create_xs_fileinfowin();
-		g_signal_connect(G_OBJECT(
-			gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))), "value_changed",
-			G_CALLBACK(xs_fileinfo_setsong), NULL);
+#ifndef AUDACIOUS_PLUGIN
+		XS_SIGNAL_CONNECT(gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj"))),
+			"value_changed", xs_fileinfo_setsong, NULL);
+#endif
 	}
 
 	/* Delete current items */
@@ -295,10 +223,9 @@
 
 
 	/* Set the generic song information */
-	tmpStr2 = g_filename_to_utf8(pcFilename, -1, NULL, NULL, NULL);
-	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_filename")), tmpStr2);
-	g_free(tmpStr2);
-	
+	tmpFilename = XS_CS_FILENAME(pcFilename);
+	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_filename")), tmpFilename);
+	g_free(tmpFilename);
 	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_songname")), tmpInfo->sidName);
 	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_composer")), tmpInfo->sidComposer);
 	gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_copyright")), tmpInfo->sidCopyright);
@@ -308,40 +235,52 @@
 	tmpMenuItem = gtk_menu_item_new_with_label(_("General info"));
 	gtk_widget_show(tmpMenuItem);
 	gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
-	g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
-		G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
+	if (xs_fileinfostil)
+		tmpNode = xs_fileinfostil->subTunes[0];
+	else
+		tmpNode = NULL;
+	XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpNode);
 
 	/* Other menu items */
 	for (n = 1; n <= tmpInfo->nsubTunes; n++) {
 		if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes && xs_fileinfostil->subTunes[n]) {
-			t_xs_stil_subnode *tmpNode = xs_fileinfostil->subTunes[n];
+			gboolean isSet = FALSE;
+			tmpNode = xs_fileinfostil->subTunes[n];
 			
 			g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i: "), n);
 
-			if (tmpNode->pName)
+			if (tmpNode->pName) {
 				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pName);
-			else if (tmpNode->pTitle)
-				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pTitle);
-			else if (tmpNode->pInfo)
-				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pInfo);
-			else
+				isSet = TRUE;
+			}
+
+			if (tmpNode->pTitle) {
+				xs_pnstrcat(tmpStr, sizeof(tmpStr),
+					isSet ? " [*]" : tmpNode->pTitle);
+				isSet = TRUE;
+			}
+
+			if (tmpNode->pInfo) {
+				xs_pnstrcat(tmpStr, sizeof(tmpStr), " [!]");
+				isSet = TRUE;
+			}
+
+			if (!isSet)
 				xs_pnstrcat(tmpStr, sizeof(tmpStr), "---");
-		} else {
-			g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i"), n);
+
+			tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
+			gtk_widget_show(tmpMenuItem);
+			gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
+			XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpNode);
 		}
 
-		tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
-		gtk_widget_show(tmpMenuItem);
-		gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
-		g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
-			G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
 	}
 
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu);
 	gtk_widget_show(tmpOptionMenu);
 
 	/* Set the subtune information */
-	xs_fileinfo_subtune(NULL, tmpMenu);
+	xs_fileinfo_subtune(tmpOptionMenu, NULL);
 
 	/* Free temporary tuneinfo */
 	xs_tuneinfo_free(tmpInfo);
@@ -351,5 +290,7 @@
 
 	XS_MUTEX_UNLOCK(xs_fileinfowin);
 
+#ifndef AUDACIOUS_PLUGIN
 	xs_fileinfo_update();
+#endif
 }
--- a/src/sid/xs_fileinfo.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_fileinfo.h	Fri Sep 07 04:04:03 2007 -0500
@@ -7,9 +7,9 @@
 extern "C" {
 #endif
 
-gint	xs_stil_init(void);
-void	xs_stil_close(void);
+#ifndef AUDACIOUS_PLUGIN
 void	xs_fileinfo_update(void);
+#endif
 void	xs_fileinfo(gchar *);
 
 #ifdef __cplusplus
--- a/src/sid/xs_genui.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_genui.c	Fri Sep 07 04:04:03 2007 -0500
@@ -9,33 +9,13 @@
 #include "xs_glade.h"
 
 
-void
-xs_cfg_sp2_filter_load                 (GtkButton       *button,
-                                        gpointer         user_data)
-{
 
-}
-
-
-void
-xs_cfg_sp2_filter_save                 (GtkButton       *button,
+gboolean
+xs_confirmwin_delete                   (GtkWidget       *widget,
+                                        GdkEvent        *event,
                                         gpointer         user_data)
 {
 
+  return FALSE;
 }
 
-
-void
-xs_cfg_sp2_filter_import               (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-xs_cfg_sp2_filter_export               (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
--- a/src/sid/xs_genui.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_genui.h	Fri Sep 07 04:04:03 2007 -0500
@@ -1,6 +1,11 @@
 #include <gtk/gtk.h>
 
 
+gboolean
+xs_configwin_delete                    (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
 void
 xs_cfg_oversample_toggled              (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
@@ -22,6 +27,10 @@
                                         gpointer         user_data);
 
 void
+xs_cfg_sp2_filter_export               (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
 xs_cfg_sp2_filter_load                 (GtkButton       *button,
                                         gpointer         user_data);
 
@@ -34,7 +43,7 @@
                                         gpointer         user_data);
 
 void
-xs_cfg_sp2_filter_export               (GtkButton       *button,
+xs_cfg_sp2_filter_delete               (GtkButton       *button,
                                         gpointer         user_data);
 
 void
@@ -54,11 +63,11 @@
                                         gpointer         user_data);
 
 void
-xs_cfg_sld_enable_toggled              (GtkToggleButton *togglebutton,
+xs_cfg_sldb_enable_toggled             (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
 
 void
-xs_cfg_sld_dbbrowse                    (GtkButton       *button,
+xs_cfg_sldb_browse                     (GtkButton       *button,
                                         gpointer         user_data);
 
 void
@@ -110,26 +119,76 @@
 xs_fileinfo_ok                         (GtkButton       *button,
                                         gpointer         user_data);
 
+gboolean
+xs_sldb_fs_delete                      (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
 void
-xs_cfg_sldb_fs_ok                      (GtkButton       *button,
+xs_sldb_fs_ok                          (GtkButton       *button,
                                         gpointer         user_data);
 
 void
-xs_cfg_sldb_fs_cancel                  (GtkButton       *button,
+xs_sldb_fs_cancel                      (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+xs_stil_fs_delete                      (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+xs_stil_fs_ok                          (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_stil_fs_cancel                      (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+xs_hvsc_fs_delete                      (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+xs_hvsc_fs_ok                          (GtkButton       *button,
                                         gpointer         user_data);
 
 void
-xs_cfg_stil_fs_ok                      (GtkButton       *button,
+xs_hvsc_fs_cancel                      (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+xs_filter_import_fs_delete             (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+xs_filter_import_fs_ok                 (GtkButton       *button,
                                         gpointer         user_data);
 
 void
-xs_cfg_stil_fs_cancel                  (GtkButton       *button,
+xs_filter_import_fs_cancel             (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+xs_filter_export_fs_delete             (GtkWidget       *widget,
+                                        GdkEvent        *event,
                                         gpointer         user_data);
 
 void
-xs_cfg_hvsc_fs_ok                      (GtkButton       *button,
+xs_filter_export_fs_ok                 (GtkButton       *button,
                                         gpointer         user_data);
 
 void
-xs_cfg_hvsc_fs_cancel                  (GtkButton       *button,
+xs_filter_export_fs_cancel             (GtkButton       *button,
                                         gpointer         user_data);
+
+gboolean
+xs_confirmwin_delete                   (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+xs_cfg_ftitle_override_toggled         (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
--- a/src/sid/xs_init.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_init.c	Fri Sep 07 04:04:03 2007 -0500
@@ -48,14 +48,16 @@
 	NULL,			/* OBSOLETE! */
 	NULL,			/* Send data to Visualization plugin */
 	NULL, NULL,		/* FILLED BY XMMS */
-	xs_get_song_info,	/* Get song title and length */
+	NULL,			/* Get song title and length */
 	xs_fileinfo,		/* Show file-information dialog */
 	NULL,			/* FILLED BY XMMS */
-	xs_get_song_tuple,	/* Tuple */
-	NULL,			/* Tuple */
+	xs_get_song_tuple,	/* Get Tuple */
+	NULL,			/* Set Tuple */
 	NULL,			/* Buffering status */
 	xs_is_our_file_vfs,	/* VFS */
-	xs_sid_fmts		/* File ext assist */
+	xs_sid_fmts,		/* File ext assist */
+	NULL,			/* ms accurate seek, mseek() */
+	NULL			/* Probe for tuple */
 };
 
 InputPlugin *sid_iplist[] = { &xs_plugin_ip, NULL };
--- a/src/sid/xs_interface.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_interface.c	Fri Sep 07 04:04:03 2007 -0500
@@ -135,10 +135,11 @@
   GList *cfg_sp2_filter_combo_items = NULL;
   GtkWidget *cfg_sp2_filter_combo_entry;
   GtkWidget *table3;
+  GtkWidget *cfg_sp2_filter_export;
   GtkWidget *cfg_sp2_filter_load;
   GtkWidget *cfg_sp2_filter_save;
   GtkWidget *cfg_sp2_filter_import;
-  GtkWidget *cfg_sp2_filter_export;
+  GtkWidget *cfg_sp2_filter_delete;
   GtkWidget *cfg_sp2_filter_frame;
   GtkWidget *label14;
   GtkWidget *w_label56;
@@ -172,7 +173,25 @@
   GtkWidget *cfg_sld_dbbrowse;
   GtkWidget *label17;
   GtkWidget *w_label26;
-  GtkWidget *w_vbox33;
+  GtkWidget *frame1;
+  GtkWidget *vbox1;
+  GtkWidget *cfg_ftitle_override;
+  GtkWidget *cfg_ftitle_box;
+  GtkWidget *cfg_ftitle_format;
+  GtkWidget *cfg_ftitle_descs;
+  GtkWidget *label29;
+  GtkWidget *w_label27;
+  GtkWidget *w_vbox19;
+  GtkWidget *w_frame31;
+  GtkWidget *w_vbox35;
+  GtkWidget *cfg_subauto_enable;
+  GtkWidget *cfg_subauto_min_only;
+  GtkWidget *cfg_subauto_box;
+  GtkWidget *w_label52;
+  GtkObject *cfg_subauto_mintime_adj;
+  GtkWidget *cfg_subauto_mintime;
+  GtkWidget *w_label53;
+  GtkWidget *label21;
   GtkWidget *w_frame7;
   GtkWidget *w_vbox8;
   GtkWidget *cfg_stil_enable;
@@ -189,39 +208,6 @@
   GtkWidget *w_alignment7;
   GtkWidget *cfg_hvsc_browse;
   GtkWidget *label18;
-  GtkWidget *w_frame16;
-  GtkWidget *vbox1;
-  GtkWidget *cfg_ftitle_override;
-  GtkWidget *cfg_ftitle_box;
-  GtkWidget *cfg_ftitle_format;
-  GtkWidget *w_hbox9;
-  GtkWidget *cfg_ftitle_desc1;
-  GtkWidget *cfg_ftitle_desc2;
-  GtkWidget *label19;
-  GtkWidget *w_label23;
-  GtkWidget *w_vbox19;
-  GtkWidget *w_frame28;
-  GtkWidget *w_vbox31;
-  GtkWidget *cfg_subctrl_none;
-  GSList *cfg_subctrl_none_group = NULL;
-  GtkWidget *cfg_subctrl_seek;
-  GtkWidget *cfg_subctrl_popup;
-  GtkWidget *cfg_subctrl_patch;
-  GtkWidget *label20;
-  GtkWidget *w_frame31;
-  GtkWidget *w_vbox35;
-  GtkWidget *cfg_subauto_enable;
-  GtkWidget *cfg_subauto_min_only;
-  GtkWidget *cfg_subauto_box;
-  GtkWidget *w_label52;
-  GtkObject *cfg_subauto_mintime_adj;
-  GtkWidget *cfg_subauto_mintime;
-  GtkWidget *w_label53;
-  GtkWidget *label21;
-  GtkWidget *w_frame22;
-  GtkWidget *w_vbox22;
-  GtkWidget *cfg_detectmagic;
-  GtkWidget *label22;
   GtkWidget *w_label3;
   GtkWidget *hbuttonbox1;
   GtkWidget *cfg_ok;
@@ -232,7 +218,7 @@
 
   xs_configwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (xs_configwin, "xs_configwin");
-  gtk_window_set_title (GTK_WINDOW (xs_configwin), _("Audacious-SID Configuration"));
+  gtk_window_set_title (GTK_WINDOW (xs_configwin), _("Audacious-SID configuration"));
 
   w_vbox1 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (w_vbox1, "w_vbox1");
@@ -343,13 +329,6 @@
   gtk_widget_set_name (cfg_samplerate_combo, "cfg_samplerate_combo");
   gtk_widget_show (cfg_samplerate_combo);
   gtk_box_pack_start (GTK_BOX (w_hbox4), cfg_samplerate_combo, FALSE, FALSE, 0);
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "8000");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "11025");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "22050");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "44100");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "48000");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "64000");
-  cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "96000");
   cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "");
   gtk_combo_set_popdown_strings (GTK_COMBO (cfg_samplerate_combo), cfg_samplerate_combo_items);
   g_list_free (cfg_samplerate_combo_items);
@@ -357,6 +336,7 @@
   cfg_samplerate = GTK_COMBO (cfg_samplerate_combo)->entry;
   gtk_widget_set_name (cfg_samplerate, "cfg_samplerate");
   gtk_widget_show (cfg_samplerate);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_samplerate), 9679);
 
   w_label8 = gtk_label_new (_("Hz"));
   gtk_widget_set_name (w_label8, "w_label8");
@@ -435,7 +415,7 @@
   w_hbox1 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (w_hbox1, "w_hbox1");
   gtk_widget_show (w_hbox1);
-  gtk_box_pack_start (GTK_BOX (w_vbox2), w_hbox1, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (w_vbox2), w_hbox1, FALSE, TRUE, 0);
 
   cfg_clock_frame = gtk_frame_new (NULL);
   gtk_widget_set_name (cfg_clock_frame, "cfg_clock_frame");
@@ -804,10 +784,6 @@
   gtk_widget_show (cfg_sp2_filter_combo);
   gtk_box_pack_start (GTK_BOX (cfg_sp_filter_controlbox), cfg_sp2_filter_combo, TRUE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (cfg_sp2_filter_combo), 2);
-  cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) _("6581 (reSID)"));
-  cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) _("8580 (reSID)"));
-  cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) _("6581R1 (alankila)"));
-  cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) _("6581R4 (alankila)"));
   cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) "");
   gtk_combo_set_popdown_strings (GTK_COMBO (cfg_sp2_filter_combo), cfg_sp2_filter_combo_items);
   g_list_free (cfg_sp2_filter_combo_items);
@@ -815,8 +791,9 @@
   cfg_sp2_filter_combo_entry = GTK_COMBO (cfg_sp2_filter_combo)->entry;
   gtk_widget_set_name (cfg_sp2_filter_combo_entry, "cfg_sp2_filter_combo_entry");
   gtk_widget_show (cfg_sp2_filter_combo_entry);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_sp2_filter_combo_entry), 9679);
 
-  table3 = gtk_table_new (2, 2, TRUE);
+  table3 = gtk_table_new (2, 3, TRUE);
   gtk_widget_set_name (table3, "table3");
   gtk_widget_show (table3);
   gtk_box_pack_start (GTK_BOX (cfg_sp_filter_controlbox), table3, FALSE, TRUE, 0);
@@ -824,7 +801,15 @@
   gtk_table_set_row_spacings (GTK_TABLE (table3), 4);
   gtk_table_set_col_spacings (GTK_TABLE (table3), 4);
 
-  cfg_sp2_filter_load = gtk_button_new_with_mnemonic (_("Load"));
+  cfg_sp2_filter_export = gtk_button_new_with_mnemonic (_("Export"));
+  gtk_widget_set_name (cfg_sp2_filter_export, "cfg_sp2_filter_export");
+  gtk_widget_show (cfg_sp2_filter_export);
+  gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_export, 2, 3, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_export, GTK_CAN_DEFAULT);
+
+  cfg_sp2_filter_load = gtk_button_new_with_mnemonic (_("Use"));
   gtk_widget_set_name (cfg_sp2_filter_load, "cfg_sp2_filter_load");
   gtk_widget_show (cfg_sp2_filter_load);
   gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_load, 0, 1, 0, 1,
@@ -843,18 +828,18 @@
   cfg_sp2_filter_import = gtk_button_new_with_mnemonic (_("Import"));
   gtk_widget_set_name (cfg_sp2_filter_import, "cfg_sp2_filter_import");
   gtk_widget_show (cfg_sp2_filter_import);
-  gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_import, 0, 1, 1, 2,
+  gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_import, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_import, GTK_CAN_DEFAULT);
 
-  cfg_sp2_filter_export = gtk_button_new_with_mnemonic (_("Export"));
-  gtk_widget_set_name (cfg_sp2_filter_export, "cfg_sp2_filter_export");
-  gtk_widget_show (cfg_sp2_filter_export);
-  gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_export, 1, 2, 1, 2,
+  cfg_sp2_filter_delete = gtk_button_new_with_mnemonic (_("Delete"));
+  gtk_widget_set_name (cfg_sp2_filter_delete, "cfg_sp2_filter_delete");
+  gtk_widget_show (cfg_sp2_filter_delete);
+  gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_delete, 2, 3, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_export, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_delete, GTK_CAN_DEFAULT);
 
   cfg_sp2_filter_frame = gtk_frame_new (NULL);
   gtk_widget_set_name (cfg_sp2_filter_frame, "cfg_sp2_filter_frame");
@@ -1020,6 +1005,7 @@
   gtk_widget_show (cfg_sld_dbpath);
   gtk_box_pack_start (GTK_BOX (cfg_sld_box), cfg_sld_dbpath, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, cfg_sld_dbpath, _("Database path and filename"), NULL);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_sld_dbpath), 9679);
 
   cfg_sld_dbbrowse = gtk_button_new_with_mnemonic (_("Browse"));
   gtk_widget_set_name (cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
@@ -1038,15 +1024,117 @@
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 4), w_label26);
   gtk_label_set_justify (GTK_LABEL (w_label26), GTK_JUSTIFY_CENTER);
 
-  w_vbox33 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (w_vbox33, "w_vbox33");
-  gtk_widget_show (w_vbox33);
-  gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox33);
+  frame1 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame1, "frame1");
+  gtk_widget_show (frame1);
+  gtk_container_add (GTK_CONTAINER (cfg_notebook), frame1);
+  gtk_container_set_border_width (GTK_CONTAINER (frame1), 4);
+
+  vbox1 = gtk_vbox_new (FALSE, 2);
+  gtk_widget_set_name (vbox1, "vbox1");
+  gtk_widget_show (vbox1);
+  gtk_container_add (GTK_CONTAINER (frame1), vbox1);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+
+  cfg_ftitle_override = gtk_check_button_new_with_mnemonic (_("Override generic Tuplez format string"));
+  gtk_widget_set_name (cfg_ftitle_override, "cfg_ftitle_override");
+  gtk_widget_show (cfg_ftitle_override);
+  gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_override, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_ftitle_override, _("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."), NULL);
+
+  cfg_ftitle_box = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (cfg_ftitle_box, "cfg_ftitle_box");
+  gtk_widget_show (cfg_ftitle_box);
+  gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_box, TRUE, TRUE, 0);
+
+  cfg_ftitle_format = gtk_entry_new ();
+  gtk_widget_set_name (cfg_ftitle_format, "cfg_ftitle_format");
+  gtk_widget_show (cfg_ftitle_format);
+  gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_format, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_ftitle_format, _("Tuplez format string for SID-files"), NULL);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_ftitle_format), 9679);
+
+  cfg_ftitle_descs = gtk_label_new (_("Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"));
+  gtk_widget_set_name (cfg_ftitle_descs, "cfg_ftitle_descs");
+  gtk_widget_show (cfg_ftitle_descs);
+  gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_descs, TRUE, TRUE, 0);
+  gtk_label_set_use_markup (GTK_LABEL (cfg_ftitle_descs), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (cfg_ftitle_descs), TRUE);
+  gtk_misc_set_padding (GTK_MISC (cfg_ftitle_descs), 8, 8);
+
+  label29 = gtk_label_new (_("Song title format:"));
+  gtk_widget_set_name (label29, "label29");
+  gtk_widget_show (label29);
+  gtk_frame_set_label_widget (GTK_FRAME (frame1), label29);
+
+  w_label27 = gtk_label_new (_("Title"));
+  gtk_widget_set_name (w_label27, "w_label27");
+  gtk_widget_show (w_label27);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 5), w_label27);
+
+  w_vbox19 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (w_vbox19, "w_vbox19");
+  gtk_widget_show (w_vbox19);
+  gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox19);
+
+  w_frame31 = gtk_frame_new (NULL);
+  gtk_widget_set_name (w_frame31, "w_frame31");
+  gtk_widget_show (w_frame31);
+  gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame31, FALSE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (w_frame31), 4);
+
+  w_vbox35 = gtk_vbox_new (FALSE, 2);
+  gtk_widget_set_name (w_vbox35, "w_vbox35");
+  gtk_widget_show (w_vbox35);
+  gtk_container_add (GTK_CONTAINER (w_frame31), w_vbox35);
+  gtk_container_set_border_width (GTK_CONTAINER (w_vbox35), 2);
+
+  cfg_subauto_enable = gtk_check_button_new_with_mnemonic (_("Add sub-tunes to playlist"));
+  gtk_widget_set_name (cfg_subauto_enable, "cfg_subauto_enable");
+  gtk_widget_show (cfg_subauto_enable);
+  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_enable, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_subauto_enable, _("If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added."), NULL);
+
+  cfg_subauto_min_only = gtk_check_button_new_with_mnemonic (_("Only tunes with specified minimum duration"));
+  gtk_widget_set_name (cfg_subauto_min_only, "cfg_subauto_min_only");
+  gtk_widget_show (cfg_subauto_min_only);
+  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_min_only, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_subauto_min_only, _("Only add sub-tunes that have a duration of at least specified time."), NULL);
+
+  cfg_subauto_box = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (cfg_subauto_box, "cfg_subauto_box");
+  gtk_widget_show (cfg_subauto_box);
+  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_box, TRUE, TRUE, 0);
+
+  w_label52 = gtk_label_new (_("Playtime:"));
+  gtk_widget_set_name (w_label52, "w_label52");
+  gtk_widget_show (w_label52);
+  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label52, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (w_label52), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_alignment (GTK_MISC (w_label52), 0, 0.5);
+
+  cfg_subauto_mintime_adj = gtk_adjustment_new (15, 1, 32767, 1, 60, 60);
+  cfg_subauto_mintime = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_subauto_mintime_adj), 1, 0);
+  gtk_widget_set_name (cfg_subauto_mintime, "cfg_subauto_mintime");
+  gtk_widget_show (cfg_subauto_mintime);
+  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), cfg_subauto_mintime, FALSE, TRUE, 0);
+
+  w_label53 = gtk_label_new (_("seconds"));
+  gtk_widget_set_name (w_label53, "w_label53");
+  gtk_widget_show (w_label53);
+  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label53, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (w_label53), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_alignment (GTK_MISC (w_label53), 0, 0.5);
+
+  label21 = gtk_label_new (_("Sub-tune handling:"));
+  gtk_widget_set_name (label21, "label21");
+  gtk_widget_show (label21);
+  gtk_frame_set_label_widget (GTK_FRAME (w_frame31), label21);
 
   w_frame7 = gtk_frame_new (NULL);
   gtk_widget_set_name (w_frame7, "w_frame7");
   gtk_widget_show (w_frame7);
-  gtk_box_pack_start (GTK_BOX (w_vbox33), w_frame7, FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame7, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (w_frame7), 4);
 
   w_vbox8 = gtk_vbox_new (FALSE, 2);
@@ -1083,6 +1171,7 @@
   gtk_widget_show (cfg_stil_dbpath);
   gtk_container_add (GTK_CONTAINER (w_alignment2), cfg_stil_dbpath);
   gtk_tooltips_set_tip (tooltips, cfg_stil_dbpath, _("Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory."), NULL);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_stil_dbpath), 9679);
 
   w_alignment1 = gtk_alignment_new (0.5, 0.5, 1, 0.300001);
   gtk_widget_set_name (w_alignment1, "w_alignment1");
@@ -1118,6 +1207,7 @@
   gtk_widget_show (cfg_hvsc_path);
   gtk_container_add (GTK_CONTAINER (w_alignment6), cfg_hvsc_path);
   gtk_tooltips_set_tip (tooltips, cfg_hvsc_path, _("Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/"), NULL);
+  gtk_entry_set_invisible_char (GTK_ENTRY (cfg_hvsc_path), 9679);
 
   w_alignment7 = gtk_alignment_new (0.5, 0.5, 1, 0.300001);
   gtk_widget_set_name (w_alignment7, "w_alignment7");
@@ -1136,191 +1226,6 @@
   gtk_widget_show (label18);
   gtk_frame_set_label_widget (GTK_FRAME (w_frame7), label18);
 
-  w_frame16 = gtk_frame_new (NULL);
-  gtk_widget_set_name (w_frame16, "w_frame16");
-  gtk_widget_show (w_frame16);
-  gtk_box_pack_start (GTK_BOX (w_vbox33), w_frame16, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (w_frame16), 4);
-
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (vbox1, "vbox1");
-  gtk_widget_show (vbox1);
-  gtk_container_add (GTK_CONTAINER (w_frame16), vbox1);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
-  cfg_ftitle_override = gtk_check_button_new_with_mnemonic (_("Override generic XMMS titles"));
-  gtk_widget_set_name (cfg_ftitle_override, "cfg_ftitle_override");
-  gtk_widget_show (cfg_ftitle_override);
-  gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_override, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_ftitle_override, _("XMMS v1.2.5 and later support generic titlestring formatting (see XMMS preferences). This option can be enabled to override those generic titles with Audacious-SID specific ones. Formatting mnemonics are explained briefly below."), NULL);
-
-  cfg_ftitle_box = gtk_vbox_new (FALSE, 2);
-  gtk_widget_set_name (cfg_ftitle_box, "cfg_ftitle_box");
-  gtk_widget_show (cfg_ftitle_box);
-  gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_box, TRUE, TRUE, 0);
-
-  cfg_ftitle_format = gtk_entry_new ();
-  gtk_widget_set_name (cfg_ftitle_format, "cfg_ftitle_format");
-  gtk_widget_show (cfg_ftitle_format);
-  gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_format, FALSE, FALSE, 2);
-
-  w_hbox9 = gtk_hbox_new (TRUE, 0);
-  gtk_widget_set_name (w_hbox9, "w_hbox9");
-  gtk_widget_show (w_hbox9);
-  gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), w_hbox9, FALSE, FALSE, 2);
-
-  cfg_ftitle_desc1 = gtk_label_new (_("%% - '%' character\n%p - Performer/composer\n%t - Song name (title)\n%c - Copyright\n%s - File type\n%m - SID model"));
-  gtk_widget_set_name (cfg_ftitle_desc1, "cfg_ftitle_desc1");
-  gtk_widget_show (cfg_ftitle_desc1);
-  gtk_box_pack_start (GTK_BOX (w_hbox9), cfg_ftitle_desc1, FALSE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (cfg_ftitle_desc1), 0.04, 0.5);
-
-  cfg_ftitle_desc2 = gtk_label_new (_("%C - Speed/clock (PAL/NTSC)\n%n - Subtune\n%N - Number of subtunes\n%f - Filename\n%F - File path\n%e - File extension"));
-  gtk_widget_set_name (cfg_ftitle_desc2, "cfg_ftitle_desc2");
-  gtk_widget_show (cfg_ftitle_desc2);
-  gtk_box_pack_start (GTK_BOX (w_hbox9), cfg_ftitle_desc2, FALSE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (cfg_ftitle_desc2), 0.04, 0.5);
-
-  label19 = gtk_label_new (_("Song name/title format:"));
-  gtk_widget_set_name (label19, "label19");
-  gtk_widget_show (label19);
-  gtk_frame_set_label_widget (GTK_FRAME (w_frame16), label19);
-
-  w_label23 = gtk_label_new (_("Title"));
-  gtk_widget_set_name (w_label23, "w_label23");
-  gtk_widget_show (w_label23);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 5), w_label23);
-  gtk_label_set_justify (GTK_LABEL (w_label23), GTK_JUSTIFY_CENTER);
-
-  w_vbox19 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (w_vbox19, "w_vbox19");
-  gtk_widget_show (w_vbox19);
-  gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox19);
-
-  w_frame28 = gtk_frame_new (NULL);
-  gtk_widget_set_name (w_frame28, "w_frame28");
-  gtk_widget_show (w_frame28);
-  gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame28, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (w_frame28), 4);
-
-  w_vbox31 = gtk_vbox_new (FALSE, 2);
-  gtk_widget_set_name (w_vbox31, "w_vbox31");
-  gtk_widget_show (w_vbox31);
-  gtk_container_add (GTK_CONTAINER (w_frame28), w_vbox31);
-  gtk_container_set_border_width (GTK_CONTAINER (w_vbox31), 2);
-
-  cfg_subctrl_none = gtk_radio_button_new_with_mnemonic (NULL, _("Disabled"));
-  gtk_widget_set_name (cfg_subctrl_none, "cfg_subctrl_none");
-  gtk_widget_show (cfg_subctrl_none);
-  gtk_box_pack_start (GTK_BOX (w_vbox31), cfg_subctrl_none, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_subctrl_none, _("No sub-tune control."), NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_subctrl_none), cfg_subctrl_none_group);
-  cfg_subctrl_none_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_subctrl_none));
-
-  cfg_subctrl_seek = gtk_radio_button_new_with_mnemonic (NULL, _("Seek back/forward changes sub-tune"));
-  gtk_widget_set_name (cfg_subctrl_seek, "cfg_subctrl_seek");
-  gtk_widget_show (cfg_subctrl_seek);
-  gtk_box_pack_start (GTK_BOX (w_vbox31), cfg_subctrl_seek, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_subctrl_seek, _("Seeking backwards/forwards selects previous/next sub-tune, similar to selector used in XMMS-SidPlay."), NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_subctrl_seek), cfg_subctrl_none_group);
-  cfg_subctrl_none_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_subctrl_seek));
-
-  cfg_subctrl_popup = gtk_radio_button_new_with_mnemonic (NULL, _("Pop-up via seekbar (UADE-style)"));
-  gtk_widget_set_name (cfg_subctrl_popup, "cfg_subctrl_popup");
-  gtk_widget_show (cfg_subctrl_popup);
-  gtk_box_pack_start (GTK_BOX (w_vbox31), cfg_subctrl_popup, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_subctrl_popup, _("By pressing the seekbar a sub-tune control window pops up, in style of UADE (Unix Amiga Delitracker Emulator)"), NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_subctrl_popup), cfg_subctrl_none_group);
-  cfg_subctrl_none_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_subctrl_popup));
-
-  cfg_subctrl_patch = gtk_radio_button_new_with_mnemonic (NULL, _("Song-position patch"));
-  gtk_widget_set_name (cfg_subctrl_patch, "cfg_subctrl_patch");
-  gtk_widget_show (cfg_subctrl_patch);
-  gtk_box_pack_start (GTK_BOX (w_vbox31), cfg_subctrl_patch, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_subctrl_patch, _("Seekbar works as a sub-tune selector (Best option if you have patched your XMMS with the song-position patch.)"), NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_subctrl_patch), cfg_subctrl_none_group);
-  cfg_subctrl_none_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_subctrl_patch));
-
-  label20 = gtk_label_new (_("Sub-tune control:"));
-  gtk_widget_set_name (label20, "label20");
-  gtk_widget_show (label20);
-  gtk_frame_set_label_widget (GTK_FRAME (w_frame28), label20);
-
-  w_frame31 = gtk_frame_new (NULL);
-  gtk_widget_set_name (w_frame31, "w_frame31");
-  gtk_widget_show (w_frame31);
-  gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame31, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (w_frame31), 4);
-
-  w_vbox35 = gtk_vbox_new (FALSE, 2);
-  gtk_widget_set_name (w_vbox35, "w_vbox35");
-  gtk_widget_show (w_vbox35);
-  gtk_container_add (GTK_CONTAINER (w_frame31), w_vbox35);
-  gtk_container_set_border_width (GTK_CONTAINER (w_vbox35), 2);
-
-  cfg_subauto_enable = gtk_check_button_new_with_mnemonic (_("Go through all sub-tunes in file"));
-  gtk_widget_set_name (cfg_subauto_enable, "cfg_subauto_enable");
-  gtk_widget_show (cfg_subauto_enable);
-  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_enable, FALSE, FALSE, 0);
-
-  cfg_subauto_min_only = gtk_check_button_new_with_mnemonic (_("Only tunes with specified minimum length "));
-  gtk_widget_set_name (cfg_subauto_min_only, "cfg_subauto_min_only");
-  gtk_widget_show (cfg_subauto_min_only);
-  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_min_only, FALSE, FALSE, 0);
-
-  cfg_subauto_box = gtk_hbox_new (FALSE, 2);
-  gtk_widget_set_name (cfg_subauto_box, "cfg_subauto_box");
-  gtk_widget_show (cfg_subauto_box);
-  gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_box, TRUE, TRUE, 0);
-
-  w_label52 = gtk_label_new (_("Playtime:"));
-  gtk_widget_set_name (w_label52, "w_label52");
-  gtk_widget_show (w_label52);
-  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label52, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (w_label52), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (w_label52), 0, 0.5);
-
-  cfg_subauto_mintime_adj = gtk_adjustment_new (15, 1, 32767, 1, 60, 60);
-  cfg_subauto_mintime = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_subauto_mintime_adj), 1, 0);
-  gtk_widget_set_name (cfg_subauto_mintime, "cfg_subauto_mintime");
-  gtk_widget_show (cfg_subauto_mintime);
-  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), cfg_subauto_mintime, FALSE, TRUE, 0);
-
-  w_label53 = gtk_label_new (_("seconds"));
-  gtk_widget_set_name (w_label53, "w_label53");
-  gtk_widget_show (w_label53);
-  gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label53, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (w_label53), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (w_label53), 0, 0.5);
-
-  label21 = gtk_label_new (_("Automatic sub-tune changes:"));
-  gtk_widget_set_name (label21, "label21");
-  gtk_widget_show (label21);
-  gtk_frame_set_label_widget (GTK_FRAME (w_frame31), label21);
-
-  w_frame22 = gtk_frame_new (NULL);
-  gtk_widget_set_name (w_frame22, "w_frame22");
-  gtk_widget_show (w_frame22);
-  gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame22, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (w_frame22), 4);
-
-  w_vbox22 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (w_vbox22, "w_vbox22");
-  gtk_widget_show (w_vbox22);
-  gtk_container_add (GTK_CONTAINER (w_frame22), w_vbox22);
-  gtk_container_set_border_width (GTK_CONTAINER (w_vbox22), 2);
-
-  cfg_detectmagic = gtk_check_button_new_with_mnemonic (_("Detect file by contents (slower)"));
-  gtk_widget_set_name (cfg_detectmagic, "cfg_detectmagic");
-  gtk_widget_show (cfg_detectmagic);
-  gtk_box_pack_start (GTK_BOX (w_vbox22), cfg_detectmagic, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_detectmagic, _("Determine if file is a SID-tune by checking the file contents. If NOT selected, filetype is determined by checking filename extension (.sid, .dat, ...)"), NULL);
-
-  label22 = gtk_label_new (_("Miscellaneous options:"));
-  gtk_widget_set_name (label22, "label22");
-  gtk_widget_show (label22);
-  gtk_frame_set_label_widget (GTK_FRAME (w_frame22), label22);
-
   w_label3 = gtk_label_new (_("Misc"));
   gtk_widget_set_name (w_label3, "w_label3");
   gtk_widget_show (w_label3);
@@ -1333,7 +1238,7 @@
   gtk_box_pack_end (GTK_BOX (w_vbox1), hbuttonbox1, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 4);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
-  gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 15);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 8);
 
   cfg_ok = gtk_button_new_with_mnemonic (_("OK"));
   gtk_widget_set_name (cfg_ok, "cfg_ok");
@@ -1349,6 +1254,9 @@
   GTK_WIDGET_SET_FLAGS (cfg_cancel, GTK_CAN_DEFAULT);
   gtk_tooltips_set_tip (tooltips, cfg_cancel, _("Cancel any changes"), NULL);
 
+  g_signal_connect ((gpointer) xs_configwin, "delete_event",
+                    G_CALLBACK (xs_configwin_delete),
+                    NULL);
   g_signal_connect ((gpointer) cfg_oversample, "toggled",
                     G_CALLBACK (xs_cfg_oversample_toggled),
                     NULL);
@@ -1364,6 +1272,9 @@
   g_signal_connect ((gpointer) cfg_sp1_filter_reset, "clicked",
                     G_CALLBACK (xs_cfg_sp1_filter_reset),
                     NULL);
+  g_signal_connect ((gpointer) cfg_sp2_filter_export, "clicked",
+                    G_CALLBACK (xs_cfg_sp2_filter_export),
+                    NULL);
   g_signal_connect ((gpointer) cfg_sp2_filter_load, "clicked",
                     G_CALLBACK (xs_cfg_sp2_filter_load),
                     NULL);
@@ -1373,8 +1284,8 @@
   g_signal_connect ((gpointer) cfg_sp2_filter_import, "clicked",
                     G_CALLBACK (xs_cfg_sp2_filter_import),
                     NULL);
-  g_signal_connect ((gpointer) cfg_sp2_filter_export, "clicked",
-                    G_CALLBACK (xs_cfg_sp2_filter_export),
+  g_signal_connect ((gpointer) cfg_sp2_filter_delete, "clicked",
+                    G_CALLBACK (xs_cfg_sp2_filter_delete),
                     NULL);
   g_signal_connect ((gpointer) cfg_mintime_enable, "toggled",
                     G_CALLBACK (xs_cfg_mintime_enable_toggled),
@@ -1389,10 +1300,19 @@
                     G_CALLBACK (xs_cfg_maxtime_changed),
                     NULL);
   g_signal_connect ((gpointer) cfg_sld_enable, "toggled",
-                    G_CALLBACK (xs_cfg_sld_enable_toggled),
+                    G_CALLBACK (xs_cfg_sldb_enable_toggled),
                     NULL);
   g_signal_connect ((gpointer) cfg_sld_dbbrowse, "clicked",
-                    G_CALLBACK (xs_cfg_sld_dbbrowse),
+                    G_CALLBACK (xs_cfg_sldb_browse),
+                    NULL);
+  g_signal_connect ((gpointer) cfg_ftitle_override, "toggled",
+                    G_CALLBACK (xs_cfg_ftitle_override_toggled),
+                    NULL);
+  g_signal_connect ((gpointer) cfg_subauto_enable, "toggled",
+                    G_CALLBACK (xs_cfg_subauto_enable_toggled),
+                    NULL);
+  g_signal_connect ((gpointer) cfg_subauto_min_only, "toggled",
+                    G_CALLBACK (xs_cfg_subauto_min_only_toggled),
                     NULL);
   g_signal_connect ((gpointer) cfg_stil_enable, "toggled",
                     G_CALLBACK (xs_cfg_stil_enable_toggled),
@@ -1403,15 +1323,6 @@
   g_signal_connect ((gpointer) cfg_hvsc_browse, "clicked",
                     G_CALLBACK (xs_cfg_hvsc_browse),
                     NULL);
-  g_signal_connect ((gpointer) cfg_ftitle_override, "toggled",
-                    G_CALLBACK (xs_cfg_ftitle_override_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) cfg_subauto_enable, "toggled",
-                    G_CALLBACK (xs_cfg_subauto_enable_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) cfg_subauto_min_only, "toggled",
-                    G_CALLBACK (xs_cfg_subauto_min_only_toggled),
-                    NULL);
   g_signal_connect ((gpointer) cfg_ok, "clicked",
                     G_CALLBACK (xs_cfg_ok),
                     NULL);
@@ -1515,10 +1426,11 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_combo, "cfg_sp2_filter_combo");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_combo_entry, "cfg_sp2_filter_combo_entry");
   GLADE_HOOKUP_OBJECT (xs_configwin, table3, "table3");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_export, "cfg_sp2_filter_export");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_load, "cfg_sp2_filter_load");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_save, "cfg_sp2_filter_save");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_import, "cfg_sp2_filter_import");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_export, "cfg_sp2_filter_export");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_delete, "cfg_sp2_filter_delete");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_frame, "cfg_sp2_filter_frame");
   GLADE_HOOKUP_OBJECT (xs_configwin, label14, "label14");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label56, "w_label56");
@@ -1550,7 +1462,24 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
   GLADE_HOOKUP_OBJECT (xs_configwin, label17, "label17");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label26, "w_label26");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox33, "w_vbox33");
+  GLADE_HOOKUP_OBJECT (xs_configwin, frame1, "frame1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, vbox1, "vbox1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_override, "cfg_ftitle_override");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_box, "cfg_ftitle_box");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_format, "cfg_ftitle_format");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_descs, "cfg_ftitle_descs");
+  GLADE_HOOKUP_OBJECT (xs_configwin, label29, "label29");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_label27, "w_label27");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox19, "w_vbox19");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_frame31, "w_frame31");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox35, "w_vbox35");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_enable, "cfg_subauto_enable");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_min_only, "cfg_subauto_min_only");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_box, "cfg_subauto_box");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_label52, "w_label52");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_mintime, "cfg_subauto_mintime");
+  GLADE_HOOKUP_OBJECT (xs_configwin, w_label53, "w_label53");
+  GLADE_HOOKUP_OBJECT (xs_configwin, label21, "label21");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_frame7, "w_frame7");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox8, "w_vbox8");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_enable, "cfg_stil_enable");
@@ -1567,37 +1496,6 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment7, "w_alignment7");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_browse, "cfg_hvsc_browse");
   GLADE_HOOKUP_OBJECT (xs_configwin, label18, "label18");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_frame16, "w_frame16");
-  GLADE_HOOKUP_OBJECT (xs_configwin, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_override, "cfg_ftitle_override");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_box, "cfg_ftitle_box");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_format, "cfg_ftitle_format");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_hbox9, "w_hbox9");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_desc1, "cfg_ftitle_desc1");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_desc2, "cfg_ftitle_desc2");
-  GLADE_HOOKUP_OBJECT (xs_configwin, label19, "label19");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_label23, "w_label23");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox19, "w_vbox19");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_frame28, "w_frame28");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox31, "w_vbox31");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subctrl_none, "cfg_subctrl_none");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subctrl_seek, "cfg_subctrl_seek");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subctrl_popup, "cfg_subctrl_popup");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subctrl_patch, "cfg_subctrl_patch");
-  GLADE_HOOKUP_OBJECT (xs_configwin, label20, "label20");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_frame31, "w_frame31");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox35, "w_vbox35");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_enable, "cfg_subauto_enable");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_min_only, "cfg_subauto_min_only");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_box, "cfg_subauto_box");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_label52, "w_label52");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_mintime, "cfg_subauto_mintime");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_label53, "w_label53");
-  GLADE_HOOKUP_OBJECT (xs_configwin, label21, "label21");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_frame22, "w_frame22");
-  GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox22, "w_vbox22");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_detectmagic, "cfg_detectmagic");
-  GLADE_HOOKUP_OBJECT (xs_configwin, label22, "label22");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label3, "w_label3");
   GLADE_HOOKUP_OBJECT (xs_configwin, hbuttonbox1, "hbuttonbox1");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ok, "cfg_ok");
@@ -1612,12 +1510,6 @@
 {
   GtkWidget *xs_fileinfowin;
   GtkWidget *w_vbox14;
-  GtkWidget *w_alignment8;
-  GtkWidget *w_frame30;
-  GtkWidget *w_hbox19;
-  GtkWidget *fileinfo_subctrl_prev;
-  GtkWidget *fileinfo_subctrl_adj;
-  GtkWidget *fileinfo_subctrl_next;
   GtkWidget *w_frame14;
   GtkWidget *table1;
   GtkWidget *w_label16;
@@ -1632,8 +1524,7 @@
   GtkWidget *w_frame15;
   GtkWidget *w_vbox15;
   GtkWidget *fileinfo_sub_tune;
-  GtkWidget *convertwidget29;
-  GtkWidget *convertwidget30;
+  GtkWidget *convertwidget7;
   GtkWidget *table2;
   GtkWidget *w_label41;
   GtkWidget *fileinfo_sub_author;
@@ -1648,49 +1539,14 @@
 
   xs_fileinfowin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (xs_fileinfowin, "xs_fileinfowin");
+  gtk_widget_set_size_request (xs_fileinfowin, 400, -1);
   gtk_window_set_title (GTK_WINDOW (xs_fileinfowin), _("Audacious-SID Fileinfo"));
-  gtk_window_set_default_size (GTK_WINDOW (xs_fileinfowin), 400, -1);
 
   w_vbox14 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (w_vbox14, "w_vbox14");
   gtk_widget_show (w_vbox14);
   gtk_container_add (GTK_CONTAINER (xs_fileinfowin), w_vbox14);
 
-  w_alignment8 = gtk_alignment_new (0.5, 0.5, 0.1, 1);
-  gtk_widget_set_name (w_alignment8, "w_alignment8");
-  gtk_widget_show (w_alignment8);
-  gtk_box_pack_start (GTK_BOX (w_vbox14), w_alignment8, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (w_alignment8), 2);
-
-  w_frame30 = gtk_frame_new (NULL);
-  gtk_widget_set_name (w_frame30, "w_frame30");
-  gtk_widget_show (w_frame30);
-  gtk_container_add (GTK_CONTAINER (w_alignment8), w_frame30);
-  gtk_container_set_border_width (GTK_CONTAINER (w_frame30), 2);
-
-  w_hbox19 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_set_name (w_hbox19, "w_hbox19");
-  gtk_widget_show (w_hbox19);
-  gtk_container_add (GTK_CONTAINER (w_frame30), w_hbox19);
-  gtk_container_set_border_width (GTK_CONTAINER (w_hbox19), 4);
-
-  fileinfo_subctrl_prev = gtk_button_new_with_mnemonic (_(" < "));
-  gtk_widget_set_name (fileinfo_subctrl_prev, "fileinfo_subctrl_prev");
-  gtk_widget_show (fileinfo_subctrl_prev);
-  gtk_box_pack_start (GTK_BOX (w_hbox19), fileinfo_subctrl_prev, FALSE, FALSE, 0);
-
-  fileinfo_subctrl_adj = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0)));
-  gtk_widget_set_name (fileinfo_subctrl_adj, "fileinfo_subctrl_adj");
-  gtk_widget_show (fileinfo_subctrl_adj);
-  gtk_box_pack_start (GTK_BOX (w_hbox19), fileinfo_subctrl_adj, TRUE, TRUE, 0);
-  gtk_widget_set_size_request (fileinfo_subctrl_adj, 80, -1);
-  gtk_scale_set_digits (GTK_SCALE (fileinfo_subctrl_adj), 0);
-
-  fileinfo_subctrl_next = gtk_button_new_with_mnemonic (_(" > "));
-  gtk_widget_set_name (fileinfo_subctrl_next, "fileinfo_subctrl_next");
-  gtk_widget_show (fileinfo_subctrl_next);
-  gtk_box_pack_start (GTK_BOX (w_hbox19), fileinfo_subctrl_next, FALSE, FALSE, 0);
-
   w_frame14 = gtk_frame_new (NULL);
   gtk_widget_set_name (w_frame14, "w_frame14");
   gtk_widget_show (w_frame14);
@@ -1744,6 +1600,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_filename), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_filename), 9679);
 
   fileinfo_songname = gtk_entry_new ();
   gtk_widget_set_name (fileinfo_songname, "fileinfo_songname");
@@ -1752,6 +1609,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_songname), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_songname), 9679);
 
   fileinfo_composer = gtk_entry_new ();
   gtk_widget_set_name (fileinfo_composer, "fileinfo_composer");
@@ -1760,6 +1618,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_composer), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_composer), 9679);
 
   fileinfo_copyright = gtk_entry_new ();
   gtk_widget_set_name (fileinfo_copyright, "fileinfo_copyright");
@@ -1768,6 +1627,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_copyright), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_copyright), 9679);
 
   label23 = gtk_label_new (_("Song Information:"));
   gtk_widget_set_name (label23, "label23");
@@ -1788,18 +1648,13 @@
   fileinfo_sub_tune = gtk_option_menu_new ();
   gtk_widget_set_name (fileinfo_sub_tune, "fileinfo_sub_tune");
   gtk_widget_show (fileinfo_sub_tune);
-  gtk_box_pack_start (GTK_BOX (w_vbox15), fileinfo_sub_tune, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (w_vbox15), fileinfo_sub_tune, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (fileinfo_sub_tune), 2);
 
-  convertwidget29 = gtk_menu_new ();
-  gtk_widget_set_name (convertwidget29, "convertwidget29");
+  convertwidget7 = gtk_menu_new ();
+  gtk_widget_set_name (convertwidget7, "convertwidget7");
 
-  convertwidget30 = gtk_menu_item_new_with_mnemonic (_(" "));
-  gtk_widget_set_name (convertwidget30, "convertwidget30");
-  gtk_widget_show (convertwidget30);
-  gtk_container_add (GTK_CONTAINER (convertwidget29), convertwidget30);
-
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (fileinfo_sub_tune), convertwidget29);
+  gtk_option_menu_set_menu (GTK_OPTION_MENU (fileinfo_sub_tune), convertwidget7);
 
   table2 = gtk_table_new (3, 2, FALSE);
   gtk_widget_set_name (table2, "table2");
@@ -1824,6 +1679,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_sub_author), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_sub_author), 9679);
 
   w_label50 = gtk_label_new (_("Name:"));
   gtk_widget_set_name (w_label50, "w_label50");
@@ -1840,6 +1696,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (fileinfo_sub_name), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_sub_name), 9679);
 
   w_label51 = gtk_label_new (_("Duration:"));
   gtk_widget_set_name (w_label51, "w_label51");
@@ -1857,6 +1714,7 @@
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_editable_set_editable (GTK_EDITABLE (entry1), FALSE);
+  gtk_entry_set_invisible_char (GTK_ENTRY (entry1), 9679);
 
   scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
@@ -1883,18 +1741,12 @@
   gtk_widget_set_name (button2, "button2");
   gtk_widget_show (button2);
   gtk_box_pack_start (GTK_BOX (w_vbox14), button2, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (button2), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (button2), 4);
   GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
 
   g_signal_connect ((gpointer) xs_fileinfowin, "delete_event",
                     G_CALLBACK (xs_fileinfo_delete),
                     NULL);
-  g_signal_connect ((gpointer) fileinfo_subctrl_prev, "clicked",
-                    G_CALLBACK (xs_subctrl_prevsong),
-                    NULL);
-  g_signal_connect ((gpointer) fileinfo_subctrl_next, "clicked",
-                    G_CALLBACK (xs_subctrl_nextsong),
-                    NULL);
   g_signal_connect ((gpointer) button2, "clicked",
                     G_CALLBACK (xs_fileinfo_ok),
                     NULL);
@@ -1902,12 +1754,6 @@
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (xs_fileinfowin, xs_fileinfowin, "xs_fileinfowin");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_vbox14, "w_vbox14");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_alignment8, "w_alignment8");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_frame30, "w_frame30");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_hbox19, "w_hbox19");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_subctrl_prev, "fileinfo_subctrl_prev");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_subctrl_adj, "fileinfo_subctrl_adj");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_subctrl_next, "fileinfo_subctrl_next");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_frame14, "w_frame14");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, table1, "table1");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label16, "w_label16");
@@ -1922,8 +1768,7 @@
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_frame15, "w_frame15");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_vbox15, "w_vbox15");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_tune, "fileinfo_sub_tune");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, convertwidget29, "convertwidget29");
-  GLADE_HOOKUP_OBJECT (xs_fileinfowin, convertwidget30, "convertwidget30");
+  GLADE_HOOKUP_OBJECT (xs_fileinfowin, convertwidget7, "convertwidget7");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, table2, "table2");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label41, "w_label41");
   GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_author, "fileinfo_sub_author");
@@ -1942,116 +1787,280 @@
 }
 
 GtkWidget*
-create_xs_sldbfileselector (void)
+create_xs_sldb_fs (void)
 {
-  GtkWidget *xs_sldbfileselector;
+  GtkWidget *xs_sldb_fs;
   GtkWidget *ok_button2;
   GtkWidget *cancel_button2;
 
-  xs_sldbfileselector = gtk_file_selection_new (_("Select HVSC song length database"));
-  gtk_widget_set_name (xs_sldbfileselector, "xs_sldbfileselector");
-  gtk_container_set_border_width (GTK_CONTAINER (xs_sldbfileselector), 10);
-  gtk_window_set_modal (GTK_WINDOW (xs_sldbfileselector), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (xs_sldbfileselector), GDK_WINDOW_TYPE_HINT_DIALOG);
+  xs_sldb_fs = gtk_file_selection_new (_("Select HVSC song length database"));
+  gtk_widget_set_name (xs_sldb_fs, "xs_sldb_fs");
+  gtk_container_set_border_width (GTK_CONTAINER (xs_sldb_fs), 10);
+  gtk_window_set_modal (GTK_WINDOW (xs_sldb_fs), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (xs_sldb_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  ok_button2 = GTK_FILE_SELECTION (xs_sldbfileselector)->ok_button;
+  ok_button2 = GTK_FILE_SELECTION (xs_sldb_fs)->ok_button;
   gtk_widget_set_name (ok_button2, "ok_button2");
   gtk_widget_show (ok_button2);
   GTK_WIDGET_SET_FLAGS (ok_button2, GTK_CAN_DEFAULT);
 
-  cancel_button2 = GTK_FILE_SELECTION (xs_sldbfileselector)->cancel_button;
+  cancel_button2 = GTK_FILE_SELECTION (xs_sldb_fs)->cancel_button;
   gtk_widget_set_name (cancel_button2, "cancel_button2");
   gtk_widget_show (cancel_button2);
   GTK_WIDGET_SET_FLAGS (cancel_button2, GTK_CAN_DEFAULT);
 
+  g_signal_connect ((gpointer) xs_sldb_fs, "delete_event",
+                    G_CALLBACK (xs_sldb_fs_delete),
+                    NULL);
   g_signal_connect ((gpointer) ok_button2, "clicked",
-                    G_CALLBACK (xs_cfg_sldb_fs_ok),
+                    G_CALLBACK (xs_sldb_fs_ok),
                     NULL);
   g_signal_connect ((gpointer) cancel_button2, "clicked",
-                    G_CALLBACK (xs_cfg_sldb_fs_cancel),
+                    G_CALLBACK (xs_sldb_fs_cancel),
                     NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldbfileselector, xs_sldbfileselector, "xs_sldbfileselector");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldbfileselector, ok_button2, "ok_button2");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldbfileselector, cancel_button2, "cancel_button2");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, xs_sldb_fs, "xs_sldb_fs");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, ok_button2, "ok_button2");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, cancel_button2, "cancel_button2");
 
-  return xs_sldbfileselector;
+  return xs_sldb_fs;
 }
 
 GtkWidget*
-create_xs_stilfileselector (void)
+create_xs_stil_fs (void)
 {
-  GtkWidget *xs_stilfileselector;
+  GtkWidget *xs_stil_fs;
   GtkWidget *ok_button3;
   GtkWidget *cancel_button3;
 
-  xs_stilfileselector = gtk_file_selection_new (_("Select STIL-database "));
-  gtk_widget_set_name (xs_stilfileselector, "xs_stilfileselector");
-  gtk_container_set_border_width (GTK_CONTAINER (xs_stilfileselector), 10);
-  gtk_window_set_modal (GTK_WINDOW (xs_stilfileselector), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (xs_stilfileselector), GDK_WINDOW_TYPE_HINT_DIALOG);
+  xs_stil_fs = gtk_file_selection_new (_("Select STIL-database"));
+  gtk_widget_set_name (xs_stil_fs, "xs_stil_fs");
+  gtk_container_set_border_width (GTK_CONTAINER (xs_stil_fs), 10);
+  gtk_window_set_modal (GTK_WINDOW (xs_stil_fs), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (xs_stil_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  ok_button3 = GTK_FILE_SELECTION (xs_stilfileselector)->ok_button;
+  ok_button3 = GTK_FILE_SELECTION (xs_stil_fs)->ok_button;
   gtk_widget_set_name (ok_button3, "ok_button3");
   gtk_widget_show (ok_button3);
   GTK_WIDGET_SET_FLAGS (ok_button3, GTK_CAN_DEFAULT);
 
-  cancel_button3 = GTK_FILE_SELECTION (xs_stilfileselector)->cancel_button;
+  cancel_button3 = GTK_FILE_SELECTION (xs_stil_fs)->cancel_button;
   gtk_widget_set_name (cancel_button3, "cancel_button3");
   gtk_widget_show (cancel_button3);
   GTK_WIDGET_SET_FLAGS (cancel_button3, GTK_CAN_DEFAULT);
 
+  g_signal_connect ((gpointer) xs_stil_fs, "delete_event",
+                    G_CALLBACK (xs_stil_fs_delete),
+                    NULL);
   g_signal_connect ((gpointer) ok_button3, "clicked",
-                    G_CALLBACK (xs_cfg_stil_fs_ok),
+                    G_CALLBACK (xs_stil_fs_ok),
                     NULL);
   g_signal_connect ((gpointer) cancel_button3, "clicked",
-                    G_CALLBACK (xs_cfg_stil_fs_cancel),
+                    G_CALLBACK (xs_stil_fs_cancel),
                     NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_stilfileselector, xs_stilfileselector, "xs_stilfileselector");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_stilfileselector, ok_button3, "ok_button3");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_stilfileselector, cancel_button3, "cancel_button3");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, xs_stil_fs, "xs_stil_fs");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, ok_button3, "ok_button3");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, cancel_button3, "cancel_button3");
 
-  return xs_stilfileselector;
+  return xs_stil_fs;
 }
 
 GtkWidget*
-create_xs_hvscpathselector (void)
+create_xs_hvsc_fs (void)
 {
-  GtkWidget *xs_hvscpathselector;
+  GtkWidget *xs_hvsc_fs;
   GtkWidget *ok_button4;
   GtkWidget *cancel_button4;
 
-  xs_hvscpathselector = gtk_file_selection_new (_("Select HVSC location prefix"));
-  gtk_widget_set_name (xs_hvscpathselector, "xs_hvscpathselector");
-  gtk_container_set_border_width (GTK_CONTAINER (xs_hvscpathselector), 10);
-  gtk_window_set_modal (GTK_WINDOW (xs_hvscpathselector), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (xs_hvscpathselector), GDK_WINDOW_TYPE_HINT_DIALOG);
+  xs_hvsc_fs = gtk_file_selection_new (_("Select HVSC location prefix"));
+  gtk_widget_set_name (xs_hvsc_fs, "xs_hvsc_fs");
+  gtk_container_set_border_width (GTK_CONTAINER (xs_hvsc_fs), 10);
+  gtk_window_set_modal (GTK_WINDOW (xs_hvsc_fs), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (xs_hvsc_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  ok_button4 = GTK_FILE_SELECTION (xs_hvscpathselector)->ok_button;
+  ok_button4 = GTK_FILE_SELECTION (xs_hvsc_fs)->ok_button;
   gtk_widget_set_name (ok_button4, "ok_button4");
   gtk_widget_show (ok_button4);
   GTK_WIDGET_SET_FLAGS (ok_button4, GTK_CAN_DEFAULT);
 
-  cancel_button4 = GTK_FILE_SELECTION (xs_hvscpathselector)->cancel_button;
+  cancel_button4 = GTK_FILE_SELECTION (xs_hvsc_fs)->cancel_button;
   gtk_widget_set_name (cancel_button4, "cancel_button4");
   gtk_widget_show (cancel_button4);
   GTK_WIDGET_SET_FLAGS (cancel_button4, GTK_CAN_DEFAULT);
 
+  g_signal_connect ((gpointer) xs_hvsc_fs, "delete_event",
+                    G_CALLBACK (xs_hvsc_fs_delete),
+                    NULL);
   g_signal_connect ((gpointer) ok_button4, "clicked",
-                    G_CALLBACK (xs_cfg_hvsc_fs_ok),
+                    G_CALLBACK (xs_hvsc_fs_ok),
                     NULL);
   g_signal_connect ((gpointer) cancel_button4, "clicked",
-                    G_CALLBACK (xs_cfg_hvsc_fs_cancel),
+                    G_CALLBACK (xs_hvsc_fs_cancel),
+                    NULL);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, xs_hvsc_fs, "xs_hvsc_fs");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, ok_button4, "ok_button4");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, cancel_button4, "cancel_button4");
+
+  return xs_hvsc_fs;
+}
+
+GtkWidget*
+create_xs_filter_import_fs (void)
+{
+  GtkWidget *xs_filter_import_fs;
+  GtkWidget *ok_button64;
+  GtkWidget *cancel_button64;
+
+  xs_filter_import_fs = gtk_file_selection_new (_("Select SIDPlay2 filters file for importing"));
+  gtk_widget_set_name (xs_filter_import_fs, "xs_filter_import_fs");
+  gtk_container_set_border_width (GTK_CONTAINER (xs_filter_import_fs), 10);
+  gtk_window_set_modal (GTK_WINDOW (xs_filter_import_fs), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (xs_filter_import_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+  ok_button64 = GTK_FILE_SELECTION (xs_filter_import_fs)->ok_button;
+  gtk_widget_set_name (ok_button64, "ok_button64");
+  gtk_widget_show (ok_button64);
+  GTK_WIDGET_SET_FLAGS (ok_button64, GTK_CAN_DEFAULT);
+
+  cancel_button64 = GTK_FILE_SELECTION (xs_filter_import_fs)->cancel_button;
+  gtk_widget_set_name (cancel_button64, "cancel_button64");
+  gtk_widget_show (cancel_button64);
+  GTK_WIDGET_SET_FLAGS (cancel_button64, GTK_CAN_DEFAULT);
+
+  g_signal_connect ((gpointer) xs_filter_import_fs, "delete_event",
+                    G_CALLBACK (xs_filter_import_fs_delete),
+                    NULL);
+  g_signal_connect ((gpointer) ok_button64, "clicked",
+                    G_CALLBACK (xs_filter_import_fs_ok),
+                    NULL);
+  g_signal_connect ((gpointer) cancel_button64, "clicked",
+                    G_CALLBACK (xs_filter_import_fs_cancel),
                     NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvscpathselector, xs_hvscpathselector, "xs_hvscpathselector");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvscpathselector, ok_button4, "ok_button4");
-  GLADE_HOOKUP_OBJECT_NO_REF (xs_hvscpathselector, cancel_button4, "cancel_button4");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, xs_filter_import_fs, "xs_filter_import_fs");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, ok_button64, "ok_button64");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, cancel_button64, "cancel_button64");
+
+  return xs_filter_import_fs;
+}
+
+GtkWidget*
+create_xs_filter_export_fs (void)
+{
+  GtkWidget *xs_filter_export_fs;
+  GtkWidget *ok_button64;
+  GtkWidget *cancel_button64;
+
+  xs_filter_export_fs = gtk_file_selection_new (_("Select SIDPlay2 filters file for exporting"));
+  gtk_widget_set_name (xs_filter_export_fs, "xs_filter_export_fs");
+  gtk_container_set_border_width (GTK_CONTAINER (xs_filter_export_fs), 10);
+  gtk_window_set_modal (GTK_WINDOW (xs_filter_export_fs), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (xs_filter_export_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  return xs_hvscpathselector;
+  ok_button64 = GTK_FILE_SELECTION (xs_filter_export_fs)->ok_button;
+  gtk_widget_set_name (ok_button64, "ok_button64");
+  gtk_widget_show (ok_button64);
+  GTK_WIDGET_SET_FLAGS (ok_button64, GTK_CAN_DEFAULT);
+
+  cancel_button64 = GTK_FILE_SELECTION (xs_filter_export_fs)->cancel_button;
+  gtk_widget_set_name (cancel_button64, "cancel_button64");
+  gtk_widget_show (cancel_button64);
+  GTK_WIDGET_SET_FLAGS (cancel_button64, GTK_CAN_DEFAULT);
+
+  g_signal_connect ((gpointer) xs_filter_export_fs, "delete_event",
+                    G_CALLBACK (xs_filter_export_fs_delete),
+                    NULL);
+  g_signal_connect ((gpointer) ok_button64, "clicked",
+                    G_CALLBACK (xs_filter_export_fs_ok),
+                    NULL);
+  g_signal_connect ((gpointer) cancel_button64, "clicked",
+                    G_CALLBACK (xs_filter_export_fs_cancel),
+                    NULL);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, xs_filter_export_fs, "xs_filter_export_fs");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, ok_button64, "ok_button64");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, cancel_button64, "cancel_button64");
+
+  return xs_filter_export_fs;
 }
 
+GtkWidget*
+create_xs_confirmwin (void)
+{
+  GtkWidget *xs_confirmwin;
+  GtkWidget *dialog_vbox1;
+  GtkWidget *xs_confirm_frame;
+  GtkWidget *label25;
+  GtkWidget *dialog_action_area1;
+  GtkWidget *hbuttonbox2;
+  GtkWidget *xs_confirm_yes;
+  GtkWidget *xs_confirm_no;
+
+  xs_confirmwin = gtk_dialog_new ();
+  gtk_widget_set_name (xs_confirmwin, "xs_confirmwin");
+  gtk_window_set_title (GTK_WINDOW (xs_confirmwin), _("Confirm selected action"));
+  gtk_window_set_type_hint (GTK_WINDOW (xs_confirmwin), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+  dialog_vbox1 = GTK_DIALOG (xs_confirmwin)->vbox;
+  gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
+  gtk_widget_show (dialog_vbox1);
+
+  xs_confirm_frame = gtk_frame_new (NULL);
+  gtk_widget_set_name (xs_confirm_frame, "xs_confirm_frame");
+  gtk_widget_show (xs_confirm_frame);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), xs_confirm_frame, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (xs_confirm_frame), 6);
+
+  label25 = gtk_label_new (_("Confirm selected action"));
+  gtk_widget_set_name (label25, "label25");
+  gtk_widget_show (label25);
+  gtk_frame_set_label_widget (GTK_FRAME (xs_confirm_frame), label25);
+
+  dialog_action_area1 = GTK_DIALOG (xs_confirmwin)->action_area;
+  gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
+  gtk_widget_show (dialog_action_area1);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
+
+  hbuttonbox2 = gtk_hbutton_box_new ();
+  gtk_widget_set_name (hbuttonbox2, "hbuttonbox2");
+  gtk_widget_show (hbuttonbox2);
+  gtk_container_add (GTK_CONTAINER (dialog_action_area1), hbuttonbox2);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 8);
+
+  xs_confirm_yes = gtk_button_new_with_mnemonic (_("Yes"));
+  gtk_widget_set_name (xs_confirm_yes, "xs_confirm_yes");
+  gtk_widget_show (xs_confirm_yes);
+  gtk_container_add (GTK_CONTAINER (hbuttonbox2), xs_confirm_yes);
+  GTK_WIDGET_SET_FLAGS (xs_confirm_yes, GTK_CAN_DEFAULT);
+
+  xs_confirm_no = gtk_button_new_with_mnemonic (_("No"));
+  gtk_widget_set_name (xs_confirm_no, "xs_confirm_no");
+  gtk_widget_show (xs_confirm_no);
+  gtk_container_add (GTK_CONTAINER (hbuttonbox2), xs_confirm_no);
+  GTK_WIDGET_SET_FLAGS (xs_confirm_no, GTK_CAN_DEFAULT);
+
+  g_signal_connect ((gpointer) xs_confirmwin, "delete_event",
+                    G_CALLBACK (xs_confirmwin_delete),
+                    NULL);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, xs_confirmwin, "xs_confirmwin");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, dialog_vbox1, "dialog_vbox1");
+  GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_frame, "xs_confirm_frame");
+  GLADE_HOOKUP_OBJECT (xs_confirmwin, label25, "label25");
+  GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, dialog_action_area1, "dialog_action_area1");
+  GLADE_HOOKUP_OBJECT (xs_confirmwin, hbuttonbox2, "hbuttonbox2");
+  GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_yes, "xs_confirm_yes");
+  GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_no, "xs_confirm_no");
+
+  return xs_confirmwin;
+}
+
--- a/src/sid/xs_interface.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_interface.h	Fri Sep 07 04:04:03 2007 -0500
@@ -4,6 +4,9 @@
 
 GtkWidget* create_xs_configwin (void);
 GtkWidget* create_xs_fileinfowin (void);
-GtkWidget* create_xs_sldbfileselector (void);
-GtkWidget* create_xs_stilfileselector (void);
-GtkWidget* create_xs_hvscpathselector (void);
+GtkWidget* create_xs_sldb_fs (void);
+GtkWidget* create_xs_stil_fs (void);
+GtkWidget* create_xs_hvsc_fs (void);
+GtkWidget* create_xs_filter_import_fs (void);
+GtkWidget* create_xs_filter_export_fs (void);
+GtkWidget* create_xs_confirmwin (void);
--- a/src/sid/xs_player.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_player.h	Fri Sep 07 04:04:03 2007 -0500
@@ -19,7 +19,7 @@
 	guint		(*plrFillBuffer)(struct t_xs_status *, gchar *, guint);
 	gboolean	(*plrLoadSID)(struct t_xs_status *, gchar *);
 	void		(*plrDeleteSID)(struct t_xs_status *);
-	t_xs_tuneinfo*	(*plrGetSIDInfo)(gchar *);
+	t_xs_tuneinfo*	(*plrGetSIDInfo)(const gchar *);
 	gboolean	(*plrUpdateSIDInfo)(struct t_xs_status *);
 	void		(*plrFlush)(struct t_xs_status *);
 } t_xs_player;
--- a/src/sid/xs_sidplay.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_sidplay.h	Fri Sep 07 04:04:03 2007 -0500
@@ -26,7 +26,7 @@
  * (those variables that are only set by libSIDPlay when tune is initialized).
  * Rest of the information is acquired in TFUNCTION2()
  */
-t_xs_tuneinfo *TFUNCTION(gchar *sidFilename)
+t_xs_tuneinfo *TFUNCTION(const gchar *sidFilename)
 {
 	t_xs_tuneinfo *pResult;
 	TTUNEINFO myInfo;
--- a/src/sid/xs_sidplay1.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_sidplay1.h	Fri Sep 07 04:04:03 2007 -0500
@@ -3,6 +3,7 @@
 
 #include "xs_player.h"
 #include "xs_support.h"
+#include "xs_slsup.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,7 +16,7 @@
 guint		xs_sidplay1_fillbuffer(t_xs_status *, gchar *, guint);
 gboolean	xs_sidplay1_load(t_xs_status *, gchar *);
 void		xs_sidplay1_delete(t_xs_status *);
-t_xs_tuneinfo*	xs_sidplay1_getinfo(gchar *);
+t_xs_tuneinfo*	xs_sidplay1_getinfo(const gchar *);
 gboolean	xs_sidplay1_updateinfo(t_xs_status *);
 
 #ifdef __cplusplus
--- a/src/sid/xs_sidplay2.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_sidplay2.h	Fri Sep 07 04:04:03 2007 -0500
@@ -3,6 +3,7 @@
 
 #include "xs_player.h"
 #include "xs_support.h"
+#include "xs_slsup.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,7 +16,7 @@
 guint		xs_sidplay2_fillbuffer(t_xs_status *, gchar *, guint);
 gboolean	xs_sidplay2_load(t_xs_status *, gchar *);
 void		xs_sidplay2_delete(t_xs_status *);
-t_xs_tuneinfo*	xs_sidplay2_getinfo(gchar *);
+t_xs_tuneinfo*	xs_sidplay2_getinfo(const gchar *);
 gboolean	xs_sidplay2_updateinfo(t_xs_status *);
 void		xs_sidplay2_flush(t_xs_status *);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sid/xs_slsup.c	Fri Sep 07 04:04:03 2007 -0500
@@ -0,0 +1,287 @@
+/*
+   XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
+
+   File information window
+
+   Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
+   (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "xs_slsup.h"
+#include "xs_config.h"
+
+
+static t_xs_sldb *xs_sldb_db = NULL;
+XS_MUTEX(xs_sldb_db);
+
+static t_xs_stildb *xs_stildb_db = NULL;
+XS_MUTEX(xs_stildb_db);
+
+
+/* STIL-database handling
+ */
+gint xs_stil_init(void)
+{
+	XS_MUTEX_LOCK(xs_cfg);
+
+	if (!xs_cfg.stilDBPath) {
+		XS_MUTEX_UNLOCK(xs_cfg);
+		return -1;
+	}
+
+	XS_MUTEX_LOCK(xs_stildb_db);
+
+	/* Check if already initialized */
+	if (xs_stildb_db)
+		xs_stildb_free(xs_stildb_db);
+
+	/* Allocate database */
+	xs_stildb_db = (t_xs_stildb *) g_malloc0(sizeof(t_xs_stildb));
+	if (!xs_stildb_db) {
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_stildb_db);
+		return -2;
+	}
+
+	/* Read the database */
+	if (xs_stildb_read(xs_stildb_db, xs_cfg.stilDBPath) != 0) {
+		xs_stildb_free(xs_stildb_db);
+		xs_stildb_db = NULL;
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_stildb_db);
+		return -3;
+	}
+
+	/* Create index */
+	if (xs_stildb_index(xs_stildb_db) != 0) {
+		xs_stildb_free(xs_stildb_db);
+		xs_stildb_db = NULL;
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_stildb_db);
+		return -4;
+	}
+
+	XS_MUTEX_UNLOCK(xs_cfg);
+	XS_MUTEX_UNLOCK(xs_stildb_db);
+	return 0;
+}
+
+
+void xs_stil_close(void)
+{
+	XS_MUTEX_LOCK(xs_stildb_db);
+	xs_stildb_free(xs_stildb_db);
+	xs_stildb_db = NULL;
+	XS_MUTEX_UNLOCK(xs_stildb_db);
+}
+
+
+t_xs_stil_node *xs_stil_get(gchar *pcFilename)
+{
+	t_xs_stil_node *pResult;
+	gchar *tmpFilename;
+
+	XS_MUTEX_LOCK(xs_stildb_db);
+	XS_MUTEX_LOCK(xs_cfg);
+
+	if (xs_cfg.stilDBEnable && xs_stildb_db) {
+		if (xs_cfg.hvscPath) {
+			/* Remove postfixed directory separator from HVSC-path */
+			tmpFilename = xs_strrchr(xs_cfg.hvscPath, '/');
+			if (tmpFilename && (tmpFilename[1] == 0))
+				tmpFilename[0] = 0;
+
+			/* Remove HVSC location-prefix from filename */
+			tmpFilename = strstr(pcFilename, xs_cfg.hvscPath);
+			if (tmpFilename)
+				tmpFilename += strlen(xs_cfg.hvscPath);
+			else
+				tmpFilename = pcFilename;
+		} else
+			tmpFilename = pcFilename;
+
+		pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
+	} else
+		pResult = NULL;
+
+	XS_MUTEX_UNLOCK(xs_stildb_db);
+	XS_MUTEX_UNLOCK(xs_cfg);
+
+	return pResult;
+}
+
+
+/* Song length database handling glue
+ */
+gint xs_songlen_init(void)
+{
+	XS_MUTEX_LOCK(xs_cfg);
+
+	if (!xs_cfg.songlenDBPath) {
+		XS_MUTEX_UNLOCK(xs_cfg);
+		return -1;
+	}
+
+	XS_MUTEX_LOCK(xs_sldb_db);
+
+	/* Check if already initialized */
+	if (xs_sldb_db)
+		xs_sldb_free(xs_sldb_db);
+
+	/* Allocate database */
+	xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
+	if (!xs_sldb_db) {
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_sldb_db);
+		return -2;
+	}
+
+	/* Read the database */
+	if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
+		xs_sldb_free(xs_sldb_db);
+		xs_sldb_db = NULL;
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_sldb_db);
+		return -3;
+	}
+
+	/* Create index */
+	if (xs_sldb_index(xs_sldb_db) != 0) {
+		xs_sldb_free(xs_sldb_db);
+		xs_sldb_db = NULL;
+		XS_MUTEX_UNLOCK(xs_cfg);
+		XS_MUTEX_UNLOCK(xs_sldb_db);
+		return -4;
+	}
+
+	XS_MUTEX_UNLOCK(xs_cfg);
+	XS_MUTEX_UNLOCK(xs_sldb_db);
+	return 0;
+}
+
+
+void xs_songlen_close(void)
+{
+	XS_MUTEX_LOCK(xs_sldb_db);
+	xs_sldb_free(xs_sldb_db);
+	xs_sldb_db = NULL;
+	XS_MUTEX_UNLOCK(xs_sldb_db);
+}
+
+
+t_xs_sldb_node *xs_songlen_get(const gchar * pcFilename)
+{
+	t_xs_sldb_node *pResult;
+
+	XS_MUTEX_LOCK(xs_sldb_db);
+
+	if (xs_cfg.songlenDBEnable && xs_sldb_db)
+		pResult = xs_sldb_get(xs_sldb_db, pcFilename);
+	else
+		pResult = NULL;
+
+	XS_MUTEX_UNLOCK(xs_sldb_db);
+
+	return pResult;
+}
+
+
+/* Allocate a new tune information structure
+ */
+t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
+		gint nsubTunes, gint startTune, const gchar * sidName,
+		const gchar * sidComposer, const gchar * sidCopyright,
+		gint loadAddr, gint initAddr, gint playAddr,
+		gint dataFileLen, const gchar *sidFormat, gint sidModel)
+{
+	t_xs_tuneinfo *pResult;
+	t_xs_sldb_node *tmpLength;
+	gint i;
+
+	/* Allocate structure */
+	pResult = (t_xs_tuneinfo *) g_malloc0(sizeof(t_xs_tuneinfo));
+	if (!pResult) {
+		xs_error(_("Could not allocate memory for t_xs_tuneinfo ('%s')\n"),
+			pcFilename);
+		return NULL;
+	}
+
+	pResult->sidFilename = XS_CS_FILENAME(pcFilename);
+	if (!pResult->sidFilename) {
+		xs_error(_("Could not allocate sidFilename ('%s')\n"),
+			pcFilename);
+		g_free(pResult);
+		return NULL;
+	}
+
+	/* Allocate space for subtune information */
+	pResult->subTunes = g_malloc0(sizeof(t_xs_subtuneinfo) * (nsubTunes + 1));
+	if (!pResult->subTunes) {
+		xs_error(_("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"),
+			pcFilename, nsubTunes);
+
+		g_free(pResult->sidFilename);
+		g_free(pResult);
+		return NULL;
+	}
+
+	/* The following allocations don't matter if they fail */
+	pResult->sidName = XS_CS_SID(sidName);
+	pResult->sidComposer = XS_CS_SID(sidComposer);
+	pResult->sidCopyright = XS_CS_SID(sidCopyright);
+
+	pResult->nsubTunes = nsubTunes;
+	pResult->startTune = startTune;
+
+	pResult->loadAddr = loadAddr;
+	pResult->initAddr = initAddr;
+	pResult->playAddr = playAddr;
+	pResult->dataFileLen = dataFileLen;
+	pResult->sidFormat = XS_CS_SID(sidFormat);
+	
+	pResult->sidModel = sidModel;
+
+	/* Get length information (NOTE: Do not free this!) */
+	tmpLength = xs_songlen_get(pcFilename);
+	
+	/* Fill in sub-tune information */
+	for (i = 0; i < pResult->nsubTunes; i++) {
+		if (tmpLength && (i < tmpLength->nLengths))
+			pResult->subTunes[i].tuneLength = tmpLength->sLengths[i];
+		else
+			pResult->subTunes[i].tuneLength = -1;
+		
+		pResult->subTunes[i].tuneSpeed = -1;
+	}
+	
+	return pResult;
+}
+
+
+/* Free given tune information structure
+ */
+void xs_tuneinfo_free(t_xs_tuneinfo * pTune)
+{
+	if (!pTune) return;
+
+	g_free(pTune->subTunes);
+	g_free(pTune->sidFilename);
+	g_free(pTune->sidName);
+	g_free(pTune->sidComposer);
+	g_free(pTune->sidCopyright);
+	g_free(pTune->sidFormat);
+	g_free(pTune);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sid/xs_slsup.h	Fri Sep 07 04:04:03 2007 -0500
@@ -0,0 +1,31 @@
+#ifndef XS_SLSUP_H
+#define XS_SLSUP_H
+
+#include "xmms-sid.h"
+#include "xs_stil.h"
+#include "xs_length.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+gint		xs_stil_init(void);
+void		xs_stil_close(void);
+t_xs_stil_node *xs_stil_get(gchar *pcFilename);
+
+gint		xs_songlen_init(void);
+void		xs_songlen_close(void);
+t_xs_sldb_node *xs_songlen_get(const gchar *);
+
+t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
+		gint nsubTunes, gint startTune, const gchar * sidName,
+		const gchar * sidComposer, const gchar * sidCopyright,
+		gint loadAddr, gint initAddr, gint playAddr,
+		gint dataFileLen, const gchar *sidFormat, gint sidModel);
+void	xs_tuneinfo_free(t_xs_tuneinfo *);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* XS_SLSUP_H */
--- a/src/sid/xs_stil.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_stil.c	Fri Sep 07 04:04:03 2007 -0500
@@ -36,6 +36,8 @@
 
 	/* Re-allocate subTune structure if needed */
 	if (nsubTunes > pNode->nsubTunes) {
+		gint clearIndex, clearLength;
+		
 		pNode->subTunes =
 			(t_xs_stil_subnode **) g_realloc(pNode->subTunes,
 			(nsubTunes + 1) * sizeof(t_xs_stil_subnode **));
@@ -46,8 +48,14 @@
 		}
 		
 		/* Clear the newly allocated memory */
-		xs_memset(&(pNode->subTunes[pNode->nsubTunes]), 0,
-		(nsubTunes - pNode->nsubTunes + 1) * sizeof(t_xs_stil_subnode **));
+		if (pNode->nsubTunes == 0) {
+			clearIndex = 0;
+			clearLength = nsubTunes + 1;
+		} else {
+			clearIndex = pNode->nsubTunes + 1;
+			clearLength = (nsubTunes - clearIndex + 1);
+		}
+		xs_memset(&(pNode->subTunes[clearIndex]), 0, clearLength * sizeof(t_xs_stil_subnode **));
 		
 		pNode->nsubTunes = nsubTunes;
 	}
@@ -268,7 +276,7 @@
 			}
 			
 			/* Some other type */
-			if (strncmp(tmpLine, " NAME:", 8) == 0) {
+			if (strncmp(tmpLine, "   NAME:", 8) == 0) {
 				XS_STILDB_MULTI;
 				g_free(tmpNode->subTunes[subEntry]->pName);
 				tmpNode->subTunes[subEntry]->pName = g_strdup(&tmpLine[9]);
@@ -299,7 +307,7 @@
 			break;
 		}
 		
-		g_free(tmpLine);
+		XS_CS_FREE(tmpLine);
 
 	} /* while */
 
--- a/src/sid/xs_support.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_support.c	Fri Sep 07 04:04:03 2007 -0500
@@ -93,7 +93,7 @@
 
 /* Load a file to a buffer, return 0 on success, negative value on error
  */
-gint xs_fload_buffer(gchar *pcFilename, guint8 **buf, size_t *bufSize)
+gint xs_fload_buffer(const gchar *pcFilename, guint8 **buf, size_t *bufSize)
 {
 	t_xs_file *f;
 	glong seekPos;
@@ -144,9 +144,10 @@
 
 /* Copy a string
  */
-gchar *xs_strncpy(gchar *pDest, gchar *pSource, size_t n)
+gchar *xs_strncpy(gchar *pDest, const gchar *pSource, size_t n)
 {
-	gchar *s, *d;
+	const gchar *s;
+	gchar *d;
 	size_t i;
 
 	/* Check the string pointers */
@@ -224,10 +225,11 @@
 /* Concatenate a given string up to given dest size or \n.
  * If size max is reached, change the end to "..."
  */
-void xs_pnstrcat(gchar *pDest, size_t iSize, gchar *pStr)
+void xs_pnstrcat(gchar *pDest, size_t iSize, const gchar *pStr)
 {
 	size_t i, n;
-	gchar *s, *d;
+	const gchar *s;
+	gchar *d;
 
 	d = pDest;
 	i = 0;
@@ -262,7 +264,7 @@
 
 /* Locate character in string
  */
-gchar *xs_strrchr(gchar *pcStr, gchar ch)
+gchar *xs_strrchr(gchar *pcStr, const gchar ch)
 {
 	gchar *lastPos = NULL;
 
@@ -276,21 +278,21 @@
 }
 
 
-void xs_findnext(gchar *pcStr, size_t *piPos)
+void xs_findnext(const gchar *pcStr, size_t *piPos)
 {
 	while (pcStr[*piPos] && isspace(pcStr[*piPos]))
 		(*piPos)++;
 }
 
 
-void xs_findeol(gchar *pcStr, size_t *piPos)
+void xs_findeol(const gchar *pcStr, size_t *piPos)
 {
 	while (pcStr[*piPos] && (pcStr[*piPos] != '\n') && (pcStr[*piPos] != '\r'))
 		(*piPos)++;
 }
 
 
-void xs_findnum(gchar *pcStr, size_t *piPos)
+void xs_findnum(const gchar *pcStr, size_t *piPos)
 {
 	while (pcStr[*piPos] && isdigit(pcStr[*piPos]))
 		(*piPos)++;
--- a/src/sid/xs_support.h	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/sid/xs_support.h	Fri Sep 07 04:04:03 2007 -0500
@@ -43,13 +43,29 @@
 #endif
 
 
-/* Metadata structures */
-#ifdef AUDACIOUS_PLUGIN
-#define t_xs_tuple Tuple
+/* Standard gettext macros
+ */
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (PACKAGE, String)
+#  ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
+#  else
+#    define N_(String) (String)
+#  endif
 #else
-#define t_xs_tuple TitleInput
+#  define _LIBINTL_H
+#  define textdomain(String) (String)
+#  define gettext(String) (String)
+#  define dgettext(Domain,Message) (Message)
+#  define dcgettext(Domain,Message,Type) (Message)
+#  define bindtextdomain(Domain,Directory) (Domain)
+#  define _(String) (String)
+#  define N_(String) (String)
 #endif
 
+
 /* VFS replacement functions
  */
 #ifdef __AUDACIOUS_NEWVFS__
@@ -76,19 +92,19 @@
 #endif
 guint16 xs_fread_be16(t_xs_file *);
 guint32 xs_fread_be32(t_xs_file *);
-gint	xs_fload_buffer(gchar *, guint8 **, size_t *);
+gint	xs_fload_buffer(const gchar *, guint8 **, size_t *);
 
 
 /* Misc functions
  */
-gchar	*xs_strncpy(gchar *, gchar *, size_t);
+gchar	*xs_strncpy(gchar *, const gchar *, size_t);
 gint	xs_pstrcpy(gchar **, const gchar *);
 gint	xs_pstrcat(gchar **, const gchar *);
-void	xs_pnstrcat(gchar *, size_t, gchar *);
-gchar	*xs_strrchr(gchar *, gchar);
-void	xs_findnext(gchar *, size_t *);
-void	xs_findeol(gchar *, size_t *);
-void	xs_findnum(gchar *, size_t *);
+void	xs_pnstrcat(gchar *, size_t, const gchar *);
+gchar	*xs_strrchr(gchar *, const gchar);
+void	xs_findnext(const gchar *, size_t *);
+void	xs_findeol(const gchar *, size_t *);
+void	xs_findnum(const gchar *, size_t *);
 
 #ifdef HAVE_MEMSET
 #define	xs_memset memset
--- a/src/sid/xs_title.c	Fri Sep 07 04:03:42 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,264 +0,0 @@
-/*  
-   XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
-   Titlestring handling
-   
-   Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
-   (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "xs_title.h"
-#include "xs_support.h"
-#include "xs_config.h"
-
-static void xs_path_split(gchar *path, gchar **tmpFilename, gchar **tmpFilePath, gchar **tmpFileExt)
-{
-	gchar *tmpStr;
-	
-	/* Split the filename into path */
-	*tmpFilePath = g_strdup(path);
-	tmpStr = xs_strrchr(*tmpFilePath, '/');
-	if (tmpStr) tmpStr[1] = 0;
-
-	/* Filename */
-	*tmpFilename = xs_strrchr(path, '/');
-	if (*tmpFilename)
-		*tmpFilename = g_strdup(*tmpFilename + 1);
-	else
-		*tmpFilename = g_strdup(path);
-
-	tmpStr = xs_strrchr(*tmpFilename, '.');
-	tmpStr[0] = 0;
-
-	/* Extension */
-	*tmpFileExt = xs_strrchr(path, '.');
-}
-
-
-#if defined(HAVE_XMMSEXTRA) || defined(AUDACIOUS_PLUGIN)
-/* Tuple support
- */
-static t_xs_tuple * xs_get_titletuple(gchar *tmpFilename, gchar *tmpFilePath,
-	gchar *tmpFileExt, t_xs_tuneinfo *p, gint subTune)
-{
-	t_xs_tuple *pResult;
-
-#ifdef AUDACIOUS_PLUGIN
-	pResult = tuple_new();
-	tuple_associate_string(pResult, "title", p->sidName);
-	tuple_associate_string(pResult, "artist", p->sidComposer);
-	tuple_associate_string(pResult, "file-name", tmpFilename);
-	tuple_associate_string(pResult, "file-ext", tmpFileExt);
-	tuple_associate_string(pResult, "file-path", tmpFilePath);
-	tuple_associate_int(pResult, "track-number", subTune);
-	tuple_associate_string(pResult, "genre", "SID-tune");
-	tuple_associate_string(pResult, "comment", p->sidCopyright);
-#else
-	pResult = (TitleInput *) g_malloc0(sizeof(TitleInput));
-	pResult->__size = XMMS_TITLEINPUT_SIZE;
-	pResult->__version = XMMS_TITLEINPUT_VERSION;
-
-	/* Create the input fields */
-	pResult->file_name = tmpFilename;
-	pResult->file_ext = tmpFileExt;
-	pResult->file_path = tmpFilePath;
-
-	pResult->track_name = g_strdup(p->sidName);
-	pResult->track_number = subTune;
-	pResult->album_name = NULL;
-	pResult->performer = g_strdup(p->sidComposer);
-	pResult->date = g_strdup((p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580");
-
-	pResult->year = 0;
-	pResult->genre = g_strdup("SID-tune");
-	pResult->comment = g_strdup(p->sidCopyright);
-#endif	
-	return pResult;
-}
-
-#ifdef AUDACIOUS_PLUGIN
-t_xs_tuple * xs_make_titletuple(t_xs_tuneinfo *p, gint subTune)
-{
-	gchar *tmpFilename, *tmpFilePath, *tmpFileExt;
-
-	xs_path_split(p->sidFilename, &tmpFilename, &tmpFilePath, &tmpFileExt);
-	
-	return xs_get_titletuple(tmpFilename, tmpFilePath, tmpFileExt, p, subTune);
-}
-#endif
-#endif
-
-
-/*
- * Create a title string based on given information and settings.
- */
-#define VPUTCH(MCH)	\
-	if (iIndex < XS_BUF_SIZE) tmpBuf[iIndex++] = MCH;
-
-#define VPUTSTR(MSTR) {						\
-	if (MSTR) {						\
-		if ((iIndex + strlen(MSTR) + 1) < XS_BUF_SIZE) {	\
-			strcpy(&tmpBuf[iIndex], MSTR);		\
-			iIndex += strlen(MSTR); 		\
-		} else						\
-			iIndex = XS_BUF_SIZE;			\
-	}							\
-}
-
-
-gchar *xs_make_titlestring(t_xs_tuneinfo *p, gint subTune)
-{
-	gchar *tmpFilename, *tmpFilePath, *tmpFileExt,
-		*pcStr, *pcResult, tmpStr[XS_BUF_SIZE], tmpBuf[XS_BUF_SIZE];
-	t_xs_subtuneinfo *subInfo;
-	gint iIndex;
-
-	/* Get filename parts */
-	xs_path_split(p->sidFilename, &tmpFilename,
-		&tmpFilePath, &tmpFileExt);
-	
-	/* Get sub-tune information */
-	if ((subTune > 0) && (subTune <= p->nsubTunes)) {
-		subInfo = &(p->subTunes[subTune - 1]);
-	} else
-		subInfo = NULL;
-
-
-	/* Check if the titles are overridden or not */
-#if defined(AUDACIOUS_PLUGIN)
-	if (!xs_cfg.titleOverride) {
-		t_xs_tuple *pTuple = xs_get_titletuple(
-			tmpFilename, tmpFilePath, tmpFileExt, p, subTune);
-		pcResult = tuple_formatter_make_title_string(pTuple, get_gentitle_format());
-		tuple_free(pTuple);
-	} else
-#elif defined(HAVE_XMMSEXTRA)
-	if (!xs_cfg.titleOverride) {
-		t_xs_tuple *pTuple = xs_get_titletuple(
-			tmpFilename, tmpFilePath, tmpFileExt, p, subTune);
-		
-		pcResult = xmms_get_titlestring(xmms_get_gentitle_format(), pTuple);
-
-		g_free(pTuple->track_name);
-		g_free(pTuple->album_name);
-		g_free(pTuple->performer);
-		g_free(pTuple->date);
-		g_free(pTuple->genre);
-		g_free(pTuple->comment);
-		g_free(pTuple);
-	} else
-#endif
-	{
-		/* Create the string */
-		pcStr = xs_cfg.titleFormat;
-		iIndex = 0;
-		while (*pcStr && (iIndex < XS_BUF_SIZE)) {
-			if (*pcStr == '%') {
-				pcStr++;
-				switch (*pcStr) {
-				case '%':
-					VPUTCH('%');
-					break;
-				case 'f':
-					VPUTSTR(tmpFilename);
-					break;
-				case 'F':
-					VPUTSTR(tmpFilePath);
-					break;
-				case 'e':
-					VPUTSTR(tmpFileExt);
-					break;
-				case 'p':
-					VPUTSTR(p->sidComposer);
-					break;
-				case 't':
-					VPUTSTR(p->sidName);
-					break;
-				case 'c':
-					VPUTSTR(p->sidCopyright);
-					break;
-				case 's':
-					VPUTSTR(p->sidFormat);
-					break;
-				case 'm':
-					switch (p->sidModel) {
-					case XS_SIDMODEL_6581:
-						VPUTSTR("6581");
-						break;
-					case XS_SIDMODEL_8580:
-						VPUTSTR("8580");
-						break;
-					case XS_SIDMODEL_ANY:
-						VPUTSTR("ANY");
-						break;
-					default:
-						VPUTSTR("?");
-						break;
-					}
-					break;
-				case 'C':
-					if (subInfo && (subInfo->tuneSpeed > 0)) {
-						switch (subInfo->tuneSpeed) {
-						case XS_CLOCK_PAL:
-							VPUTSTR("PAL");
-							break;
-						case XS_CLOCK_NTSC:
-							VPUTSTR("NTSC");
-							break;
-						case XS_CLOCK_ANY:
-							VPUTSTR("ANY");
-							break;
-						case XS_CLOCK_VBI:
-							VPUTSTR("VBI");
-							break;
-						case XS_CLOCK_CIA:
-							VPUTSTR("CIA");
-							break;
-						default:
-							g_snprintf(tmpStr, XS_BUF_SIZE,
-							"%iHz", subInfo->tuneSpeed);
-							VPUTSTR(tmpStr);
-						}
-					} else
-						VPUTSTR("?");
-					break;
-				case 'n':
-					g_snprintf(tmpStr, XS_BUF_SIZE, "%i", subTune);
-					VPUTSTR(tmpStr);
-					break;
-				case 'N':
-					g_snprintf(tmpStr, XS_BUF_SIZE, "%i", p->nsubTunes);
-					VPUTSTR(tmpStr);
-					break;
-				}
-			} else
-				VPUTCH(*pcStr);
-
-			pcStr++;
-		}
-
-		tmpBuf[iIndex] = 0;
-
-		/* Make resulting string */
-		pcResult = g_strdup(tmpBuf);
-	}
-
-	/* Free temporary strings */
-	g_free(tmpFilename);
-	g_free(tmpFilePath);
-
-	return pcResult;
-}
--- a/src/sid/xs_title.h	Fri Sep 07 04:03:42 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#ifndef XS_TITLE_H
-#define XS_TITLE_H
-
-#include "xmms-sid.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-gchar *xs_make_titlestring(t_xs_tuneinfo *, gint);
-#ifdef AUDACIOUS_PLUGIN
-t_xs_tuple *xs_make_titletuple(t_xs_tuneinfo *p, gint subTune);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* XS_TITLE_H */
--- a/src/xspf/xspf.c	Fri Sep 07 04:03:42 2007 -0500
+++ b/src/xspf/xspf.c	Fri Sep 07 04:04:03 2007 -0500
@@ -112,16 +112,16 @@
         if(nptr->type == XML_ELEMENT_NODE
            && !xmlStrcmp(nptr->name, (xmlChar *)"location")) {
             gchar *str = (gchar *)xmlNodeGetContent(nptr);
-            gchar *tmp = NULL;
 
-            // tmp is escaped uri or a part of escaped uri.
-            tmp = g_strdup_printf("%s%s", base ? base : "", str);
-            location = g_filename_from_uri(tmp, NULL, NULL);
-            if(!location) // http:// or something.
-                location = g_strdup(tmp);
-
-            xmlFree(str); str = NULL;
-            g_free(tmp); tmp = NULL;
+            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 if(nptr->type == XML_ELEMENT_NODE
                 && !xmlStrcmp(nptr->name, (xmlChar *)"title")) {