Merge branch 'master' into i18n

19 files changed, 1794 insertions, 17 deletions

diff --git a/conf.c b/conf.c
index 887ad053..f875d349 100644
--- a/conf.c
+++ b/conf.c
@@ -52,7 +52,10 @@ conf_free (void) {
         next = it->next;
         conf_item_free (it);
     }
+    conf_items = NULL;
+    changed = 0;
     mutex_free (mutex);
+    mutex = 0;
 }
 
 int
diff --git a/configure.ac b/configure.ac
index 2f15a13b..64874ab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,11 @@ fi
 dnl check for libdl
 AC_CHECK_LIB([dl], [main], [HAVE_DL=yes;DL_LIBS="-ldl";AC_SUBST(DL_LIBS)])
 
+dnl check libsocket (OpenIndiana)
+AC_CHECK_LIB([socket], [main], [HAVE_SOCKET=yes;DL_LIBS="-lsocket";AC_SUBST(DL_LIBS)])
+dnl check for seperate alloca.h (OpenIndiana)
+AC_CHECK_HEADER([alloca.h],[],[alloca.h not found.])
+
 if test "x$enable_portable" != "xno" && test "x$enable_staticlink" != "xno" ; then
     AC_DEFINE_UNQUOTED([PORTABLE], [1], [Define if building portable version])
     PORTABLE=yes
diff --git a/main.c b/main.c
index 2a4d220e..db8205fa 100644
--- a/main.c
+++ b/main.c
@@ -15,6 +15,9 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -26,7 +29,7 @@
 #include <sys/prctl.h>
 #endif
 #ifndef __linux__
-#define _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 1
 #endif
 #include <limits.h>
 #include <errno.h>
@@ -41,9 +44,6 @@
 #ifdef __linux__
 #include <execinfo.h>
 #endif
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 #include <unistd.h>
 #include "gettext.h"
 #include "playlist.h"
diff --git a/playlist.c b/playlist.c
index f339c7d4..9aee5540 100644
--- a/playlist.c
+++ b/playlist.c
@@ -18,6 +18,9 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
@@ -31,7 +34,7 @@
 #include <time.h>
 #include <sys/time.h>
 #ifndef __linux__
-#define _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 1
 #endif
 #include <limits.h>
 #include <errno.h>
@@ -162,6 +165,7 @@ pl_free (void) {
         mutex_plt = 0;
     }
 #endif
+    playlist = NULL;
 }
 
 #if DEBUG_LOCKING
diff --git a/plugins.c b/plugins.c
index fcf14720..38abace1 100644
--- a/plugins.c
+++ b/plugins.c
@@ -24,7 +24,7 @@
 //#include <alloca.h>
 #include <string.h>
 #ifndef __linux__
-#define _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 1
 #endif
 #include <limits.h>
 #ifdef HAVE_CONFIG_H
@@ -556,7 +556,7 @@ load_plugin (const char *plugdir, char *d_name, int l) {
     trace ("loading plugin %s/%s\n", plugdir, d_name);
     void *handle = dlopen (fullname, RTLD_NOW);
     if (!handle) {
-        //trace ("dlopen error: %s\n", dlerror ());
+        trace ("dlopen error: %s\n", dlerror ());
 #ifdef ANDROID
         return -1;
 #else
@@ -996,6 +996,17 @@ plug_unload_all (void) {
         g_gui_names[i] = NULL;
     }
     plugins_tail = NULL;
+
+    memset (g_plugins, 0, sizeof (g_plugins));
+    memset (g_gui_names, 0, sizeof (g_gui_names));
+    g_num_gui_names = 0;
+    memset (g_decoder_plugins, 0, sizeof (g_decoder_plugins));
+    memset (g_vfs_plugins, 0, sizeof (g_vfs_plugins));
+    memset (g_dsp_plugins, 0, sizeof (g_dsp_plugins));
+    memset (g_output_plugins, 0, sizeof (g_output_plugins));
+    output_plugin = NULL;
+    memset (g_playlist_plugins, 0, sizeof (g_playlist_plugins));
+
     trace ("all plugins had been unloaded\n");
 }
 
diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c
index c8a6abc4..6f3e4273 100644
--- a/plugins/aac/aac.c
+++ b/plugins/aac/aac.c
@@ -1256,7 +1256,7 @@ aac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
         MP4Close (mp4);
 #endif
     }
-    else if (ftype == "aac") {
+    else if (ftype && !strcmp (ftype, "RAW AAC")) {
         int apeerr = deadbeef->junk_apev2_read (it, fp);
         int v2err = deadbeef->junk_id3v2_read (it, fp);
         int v1err = deadbeef->junk_id3v1_read (it, fp);
diff --git a/plugins/artwork/albumartorg.c b/plugins/artwork/albumartorg.c
index ada7179f..51ca54cb 100644
--- a/plugins/artwork/albumartorg.c
+++ b/plugins/artwork/albumartorg.c
@@ -16,6 +16,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c
index c2a8b766..7f56b870 100644
--- a/plugins/artwork/artwork.c
+++ b/plugins/artwork/artwork.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -721,6 +724,11 @@ static const char *filter_custom_mask = NULL;
 static int
 filter_custom (const struct dirent *f)
 {
+// FNM_CASEFOLD is not defined on solaris. On other platforms it is.
+// It should be safe to define it as FNM_INGORECASE if it isn't defined.
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD FNM_IGNORECASE
+#endif
     if (!fnmatch (filter_custom_mask, f->d_name, FNM_CASEFOLD)) {
         return 1;
     }
diff --git a/plugins/artwork/lastfm.c b/plugins/artwork/lastfm.c
index 2e78fd87..91972c8a 100644
--- a/plugins/artwork/lastfm.c
+++ b/plugins/artwork/lastfm.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/plugins/mms/libmms/bswap.h b/plugins/mms/libmms/bswap.h
index 6a6e1d10..7fe6db62 100644
--- a/plugins/mms/libmms/bswap.h
+++ b/plugins/mms/libmms/bswap.h
@@ -271,6 +271,17 @@
 #define GINT16_TO_LE(val) (val)
 #endif
 
+/* If this is not defined, we are on Solaris */
+#ifndef u_int16_t
+#define u_int16_t uint16_t
+#endif
+#ifndef u_int32_t
+#define u_int32_t uint32_t
+#endif
+#ifndef u_int64_t
+#define u_int64_t uint64_t
+#endif
+
 #define LE_16(val) (GINT16_FROM_LE (*((u_int16_t*)(val))))
 #define BE_16(val) (GINT16_FROM_BE (*((u_int16_t*)(val))))
 #define LE_32(val) (GINT32_FROM_LE (*((u_int32_t*)(val))))
diff --git a/plugins/shellexec/shellexec.c b/plugins/shellexec/shellexec.c
index 8ecf223e..76d31e34 100644
--- a/plugins/shellexec/shellexec.c
+++ b/plugins/shellexec/shellexec.c
@@ -37,7 +37,9 @@
         remote - command allowed only for non-local files
         disabled - ignore command
 */
-
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/plugins/sndfile/sndfile.c b/plugins/sndfile/sndfile.c
index 269cdd51..eae39b86 100644
--- a/plugins/sndfile/sndfile.c
+++ b/plugins/sndfile/sndfile.c
@@ -16,6 +16,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #ifndef __linux__
 #define _LARGEFILE64_SOURCE
 #endif
@@ -308,6 +311,7 @@ sndfile_seek (DB_fileinfo_t *_info, float sec) {
 
 static DB_playItem_t *
 sndfile_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+    trace ("adding file %s\n", fname);
     SF_INFO inf;
     sndfile_info_t info;
     memset (&info, 0, sizeof (info));
@@ -317,12 +321,15 @@ sndfile_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
         return NULL;
     }
     int64_t fsize = deadbeef->fgetlength (info.file);
+    trace ("file: %p, size: %lld\n", info.file, deadbeef->fgetlength (info.file));
+    trace ("calling sf_open_virtual\n");
     info.ctx = sf_open_virtual (&vfs, SFM_READ, &inf, &info);
     if (!info.ctx) {
         trace ("sndfile: sf_open failed");
         deadbeef->fclose (info.file);
         return NULL;
     }
+    trace ("calling sf_open_virtual ok\n");
     int totalsamples = inf.frames;
     int samplerate = inf.samplerate;
     sf_close (info.ctx);
diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c
index 805f04f1..8a069300 100644
--- a/plugins/vfs_curl/vfs_curl.c
+++ b/plugins/vfs_curl/vfs_curl.c
@@ -611,7 +611,7 @@ http_thread_func (void *ctx) {
             if (*proxyuser || *proxypass) {
 #if LIBCURL_VERSION_MINOR >= 19 && LIBCURL_VERSION_PATCH >= 1
                 curl_easy_setopt (curl, CURLOPT_PROXYUSERNAME, proxyuser);
-                curl_easy_setopt (curl, CURLOPT_PROXYUSERNAME, proxypass);
+                curl_easy_setopt (curl, CURLOPT_PROXYPASSWORD, proxypass);
 #else
                 char pwd[200];
                 snprintf (pwd, sizeof (pwd), "%s:%s", proxyuser, proxypass);
@@ -784,7 +784,7 @@ http_read (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
         }
     //    trace ("buffer remaining: %d\n", fp->remaining);
         deadbeef->mutex_lock (fp->mutex);
-        trace ("http_read %lld/%lld/%d\n", fp->pos, fp->length, fp->remaining);
+        //trace ("http_read %lld/%lld/%d\n", fp->pos, fp->length, fp->remaining);
         int cp = min (sz, fp->remaining);
         int readpos = fp->pos & BUFFER_MASK;
         int part1 = BUFFER_SIZE-readpos;
@@ -813,7 +813,7 @@ http_read (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
 
 static int
 http_seek (DB_FILE *stream, int64_t offset, int whence) {
-    trace ("http_seek %lld %d\n", offset, whence);
+    //trace ("http_seek %lld %d\n", offset, whence);
     assert (stream);
     HTTP_FILE *fp = (HTTP_FILE *)stream;
     fp->seektoend = 0;
diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c
index c85a0c63..f12123ee 100644
--- a/plugins/vorbis/vorbis.c
+++ b/plugins/vorbis/vorbis.c
@@ -15,6 +15,9 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 #include <string.h>
@@ -23,9 +26,6 @@
 #include <limits.h>
 #include <unistd.h>
 #include <math.h>
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 #include "../../deadbeef.h"
 #include "vcedit.h"
 
diff --git a/plugins/wildmidi/src/wildmidi_lib.c b/plugins/wildmidi/src/wildmidi_lib.c
index 97912c50..66a2ca4a 100644
--- a/plugins/wildmidi/src/wildmidi_lib.c
+++ b/plugins/wildmidi/src/wildmidi_lib.c
@@ -137,7 +137,9 @@
 		
 	========================================
 */
-
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -155,7 +157,6 @@
 #ifdef _WIN32
 # include <windows.h>
 #endif
-#include "config.h"
 #include "wildmidi_lib.h"
 
 /*
diff --git a/po/deadbeef.pot b/po/deadbeef.pot
new file mode 100644
index 00000000..9a56f44f
--- /dev/null
+++ b/po/deadbeef.pot
@@ -0,0 +1,1711 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-12 13:48+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../plugins/gtkui/callbacks.c:121
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:132 ../plugins/gtkui/gtkui.c:776
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:142
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:177
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:218
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:223
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:697
+msgid "Failed while reading help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:707
+msgid "Failed to load help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:722
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:723 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:733
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:746
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:1091
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:689 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:692 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2870 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/interface.c:402
+msgid "Title:"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:748
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:752
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:756
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:826
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:632
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:643
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:761
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:914 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:917
+#, c-format
+msgid "New Playlist (%d)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_File"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_Open file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:2970
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "New playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Load playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Save playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Edit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_Clear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:114
+msgid "Select all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Invert selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:453
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/converter/interface.c:653
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:315 ../plugins/gtkui/prefwin.c:623
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:630
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1869 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:998 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1002 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1798
+#: ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Preferences"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_View"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Status bar"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3246
+#: ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Linear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle tracks"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:66
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_Help"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "_About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Search"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Stop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Pause"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Previous"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "Next"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Track Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_Apply"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Close"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:603
+#: ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:312
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3098
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2901
+#: ../plugins/gtkui/interface.c:3013 ../plugins/gtkui/interface.c:3139
+#: ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2922
+#: ../plugins/gtkui/interface.c:3034 ../plugins/gtkui/interface.c:3160
+#: ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_OK"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1819 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:105
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1867
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1868
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1879 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1883 ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1893 ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1910 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1914 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1918 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/interface.c:2471
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:657
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1974 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1999 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2003 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2007 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:49
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2019 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2027 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:136
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2069 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2092 ../plugins/gtkui/interface.c:2136
+#: ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2101 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2108 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2127 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2145 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:69
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2190 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/interface.c:2254
+#: ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2210 ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2219 ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2235 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2261 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Selected row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2280 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2293 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2306 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playlist colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2327 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2341 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2355 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2397 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2492 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2502 ../plugins/gtkui/deadbeef.glade.h:93
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2981 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3083 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3207 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3223 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3253
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3254
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3307 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/converter/interface.c:758
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3323 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:774
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3409 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3440 ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3444 ../plugins/gtkui/interface.c:3571
+#: ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3448 ../plugins/gtkui/interface.c:3527
+#: ../plugins/gtkui/interface.c:3567 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/interface.c:3535
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3460 ../plugins/gtkui/interface.c:3583
+#: ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3464 ../plugins/gtkui/interface.c:3539
+#: ../plugins/gtkui/interface.c:3579 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3479
+msgid "2.3 (Recommended)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3480
+msgid "2.4"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3486 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3523 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:313 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:314 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:325
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:326
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:327 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:429
+msgid "Add to playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:434
+msgid "Remove from playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:442
+msgid "Reload metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:461
+msgid "Remove from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:840 ../plugins/gtkui/plcommon.c:965
+msgid "Add column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:870 ../plugins/gtkui/plcommon.c:969
+msgid "Edit column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:973
+msgid "Remove column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:983
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:990
+msgid "None"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:994
+msgid "Artist/Date/Album"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:649
+msgid "Add"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr ""
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:90
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../main.c:92
+#, c-format
+msgid "   --help  or  -h     Print help (this message) and exit\n"
+msgstr ""
+
+#: ../main.c:93
+#, c-format
+msgid "   --quit             Quit player\n"
+msgstr ""
+
+#: ../main.c:94
+#, c-format
+msgid "   --version          Print version info and exit\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid "   --play             Start playback\n"
+msgstr ""
+
+#: ../main.c:96
+#, c-format
+msgid "   --stop             Stop playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid "   --pause            Pause playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid "   --toggle-pause     Toggle pause\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid ""
+"   --play-pause       Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid "   --next             Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid "   --prev             Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid "   --random           Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid "   --queue            Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid ""
+"                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+"                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+"                      copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:108
+#, c-format
+msgid ""
+"                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+"                      for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:443 ../playlist.c:2609
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3858
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3858
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:55
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:67
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr ""
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/interface.c:97
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:118
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:129
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:142
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:166
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:189
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:202
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:212
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:213
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:214
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:220
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:228
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:230
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:386
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:409
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:424
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:432
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:443
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:453
+#, c-format
+msgid ""
+"<small>%o - output file name\n"
+"%i - temporary input file name</small>"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:469
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:470
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:493
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:499
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:505
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:517
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:527
+msgid "<b>Tag writer</b>"
+msgstr ""
+
+#: ../plugins/converter/interface.c:614
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:637
+msgid "Untitled DSP Preset"
+msgstr ""
diff --git a/streamer.c b/streamer.c
index 2f137891..74398e34 100644
--- a/streamer.c
+++ b/streamer.c
@@ -1580,6 +1580,7 @@ streamer_dsp_init (void) {
 
 int
 streamer_init (void) {
+    streaming_terminate = 0;
 #if WRITE_DUMP
     out = fopen ("out.raw", "w+b");
 #endif
diff --git a/utf8.c b/utf8.c
index 4efb2ea6..6165742e 100644
--- a/utf8.c
+++ b/utf8.c
@@ -19,6 +19,12 @@
     by Jeff Bezanson
     placed in the public domain Fall 2005
 */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+#ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/vfs_stdio.c b/vfs_stdio.c
index 840ee722..6f006efa 100644
--- a/vfs_stdio.c
+++ b/vfs_stdio.c
@@ -169,6 +169,7 @@ static DB_vfs_t plugin = {
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_VFS,
     .plugin.name = "stdio vfs",
+    .plugin.id = "vfs_stdio",
     .plugin.descr = "Standard IO plugin\nUsed for reading normal local files\nIt is statically linked, so you can't delete it.",
     .plugin.copyright = 
         "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n"