0.5.2-rc2 fixes

11 files changed, 52 insertions, 1737 deletions

diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION
index d64531f1..5b5cff9c 100644
--- a/PORTABLE_VERSION
+++ b/PORTABLE_VERSION
@@ -1 +1 @@
-devel
+0.5.2-rc2
diff --git a/configure.ac b/configure.ac
index 68b81e2f..daa68e4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([deadbeef], [devel])
+AC_INIT([deadbeef], [0.5.2-rc2])
 
 AC_CONFIG_HEADER(config.h)
 
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am
index 3bd6fd85..6a56e1b8 100644
--- a/plugins/adplug/Makefile.am
+++ b/plugins/adplug/Makefile.am
@@ -5,9 +5,9 @@ adlibdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = adplug.la
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
-adplug_la_LDFLAGS = -module -nostdlib
+adplug_la_LDFLAGS = -module -nostdlib -lm -lsupc++
 
-AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -fPIC
+AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
 
 adplug_la_SOURCES = plugin.c\
                    adplug-db.cpp\
diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
index 98005298..f6936ff6 100644
--- a/plugins/adplug/adplug-db.cpp
+++ b/plugins/adplug/adplug-db.cpp
@@ -42,6 +42,12 @@ int _Unwind_GetDataRelBase;
 int _Unwind_GetRegionStart;
 int _Unwind_SetGR;
 int _Unwind_GetIPInfo;
+//int __cxa_pure_virtual;
+////int _Znaj;
+////int _ZdaPv;
+//int __cxa_guard_release;
+////int _ZdlPv;
+//int __cxa_guard_acquire;
 
 extern "C" {
 
diff --git a/plugins/ao/Makefile.am b/plugins/ao/Makefile.am
index 62df2b2c..5a7750e5 100644
--- a/plugins/ao/Makefile.am
+++ b/plugins/ao/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_PSF
 aodir = $(libdir)/$(PACKAGE)
-pkglib_LTLIBRARIES = ddb_aopsf.la
-ddb_aopsf_la_SOURCES = plugin.c main.c corlett.c\
+pkglib_LTLIBRARIES = ddb_ao.la
+ddb_ao_la_SOURCES = plugin.c main.c corlett.c\
 eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\
 eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \
 eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\
@@ -17,11 +17,11 @@ eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\
 eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
 eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h 
 
-ddb_aopsf_la_LDFLAGS = -module -fPIC
+ddb_ao_la_LDFLAGS = -module -fPIC
 
 EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
 
-ddb_aopsf_la_LIBADD = $(LDADD)
+ddb_ao_la_LIBADD = $(LDADD)
 AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm $(ZLIB_LIBS)
 endif
 
diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c
index dee8c4a6..af376e66 100644
--- a/plugins/ao/plugin.c
+++ b/plugins/ao/plugin.c
@@ -387,7 +387,7 @@ static DB_decoder_t plugin = {
 };
 
 DB_plugin_t *
-ddb_aopsf_load (DB_functions_t *api) {
+ddb_ao_load (DB_functions_t *api) {
     deadbeef = api;
     return DB_PLUGIN (&plugin);
 }
diff --git a/plugins/converter/support.c b/plugins/converter/support.c
index 1e6087da..06482131 100644
--- a/plugins/converter/support.c
+++ b/plugins/converter/support.c
@@ -158,4 +158,29 @@ GtkWidget *
 gtk_combo_box_text_new () {
     return gtk_combo_box_new_text ();
 }
+
+GtkWidget *
+gtk_combo_box_text_new_with_entry   (void) {
+    return gtk_combo_box_entry_new ();
+}
+
+void
+gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_append_text (combo_box, text);
+}
+
+void
+gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, gint position, const gchar *text) {
+    gtk_combo_box_insert_text (combo_box, position, text);
+}
+
+void
+gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_prepend_text (combo_box, text);
+}
+gchar *
+gtk_combo_box_text_get_active_text  (GtkComboBoxText *combo_box) {
+    return gtk_combo_box_get_active_text (combo_box);
+}
+
 #endif
diff --git a/po/deadbeef.pot b/po/deadbeef.pot
deleted file mode 100644
index 0395968e..00000000
--- a/po/deadbeef.pot
+++ /dev/null
@@ -1,1721 +0,0 @@
-# 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-11-23 14:16+0100\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:123
-msgid "Supported sound formats"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:134
-msgid "All files (*)"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:144
-msgid "Open file(s)..."
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:179
-msgid "Add file(s) to playlist..."
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:220
-msgid "Add folder(s) to playlist..."
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:225
-msgid "Follow symlinks"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:711
-msgid "Failed while reading help file"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:721
-msgid "Failed to load help file"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:736
-msgid "help.txt"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
-#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
-#: ../plugins/converter/convgui.c:1248
-msgid "Help"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:747
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:760
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr ""
-
-#: ../plugins/gtkui/callbacks.c:1116
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr ""
-
-#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
-msgid "Edit playlist"
-msgstr ""
-
-#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
-#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
-#: ../plugins/converter/interface.c:395
-msgid "Title:"
-msgstr ""
-
-#: ../plugins/gtkui/ddbtabstrip.c:814
-msgid "Rename Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/ddbtabstrip.c:821
-msgid "Remove Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/ddbtabstrip.c:828
-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:820
-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:644
-msgid "Save Playlist As"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:655
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:773
-msgid "Load Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:788
-msgid "Other files (*)"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
-msgid "New Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:929
-#, c-format
-msgid "New Playlist (%d)"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "_File"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
-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:3022
-#: ../plugins/gtkui/deadbeef.glade.h:9
-msgid "Add location"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
-msgid "New playlist"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Load playlist"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Save playlist"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
-msgid "_Quit"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
-msgid "_Edit"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "_Clear"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
-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:55
-msgid "Invert selection"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Selection"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
-#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
-#: ../plugins/converter/interface.c:645
-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:157
-msgid "_Find"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Sort By"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
-#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
-#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
-#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
-#: ../plugins/converter/interface.c:622
-msgid "Title"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Track number"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
-#: ../plugins/gtkui/interface.c:1875 ../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:1013 ../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:1017 ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Custom"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Preferences"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "_View"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
-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:132
-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:164
-msgid "_Playback"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
-#: ../plugins/gtkui/deadbeef.glade.h:83
-msgid "Order"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
-msgid "Linear"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle tracks"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle albums"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Random"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
-msgid "Looping"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Loop All"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
-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:111
-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:127
-msgid "Stop after current"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Jump to current track"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
-#: ../plugins/gtkui/deadbeef.glade.h:159
-msgid "_Help"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "_ChangeLog"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
-msgid "_GPLv2"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "_LGPLv2.1"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "_About"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Translators"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Search"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Stop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Play"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
-msgid "Pause"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Previous"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
-msgid "Next"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
-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:103
-msgid "Quit"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Track Properties"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Settings"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "_Apply"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
-#: ../plugins/gtkui/deadbeef.glade.h:154
-msgid "_Close"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
-msgid "Metadata"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
-#: ../plugins/gtkui/deadbeef.glade.h:97
-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:141
-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:315
-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:319
-#: ../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:3150
-#: ../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:2953
-#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
-#: ../plugins/gtkui/deadbeef.glade.h:151
-msgid "_Cancel"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
-#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
-#: ../plugins/gtkui/deadbeef.glade.h:162
-msgid "_OK"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Output plugin:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
-msgid "Output device:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Sound"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "Replaygain mode:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1873
-msgid "Disable"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1874
-msgid "Track"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "Replaygain peak scale"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
-#: ../plugins/gtkui/deadbeef.glade.h:2
-msgid "-12 dB"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:1
-msgid "+12 dB"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Replaygain preamp:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "Global preamp:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
-msgid "Resume previous session on startup"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Don't add from archives when adding folders"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Playback"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
-#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
-msgid "Configure"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "DSP Chain Preset"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "_Load"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "DSP"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Close minimizes to tray"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
-msgid "Middle mouse button closes playlist"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Hide system tray icon"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Use bold font for currently playing track"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
-msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Interface refresh rate (times per second):"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Titlebar text while playing:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Titlebar text while stopped:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
-msgid "GUI Plugin (changing requires restart):"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "GUI"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
-#: ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Override"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Foreground"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Background"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Seekbar/Volumebar colors"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
-msgid "Middle"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
-msgid "Light"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Dark"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "Base"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
-#: ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Text"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tab strip colors"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Even row"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
-msgid "Odd row"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Selected row"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Selected text"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Cursor"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Playlist colors"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
-msgid "Colors"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Enable Proxy Server"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
-msgid "Proxy Server Address:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
-msgid "Proxy Server Port:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Proxy Type:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Proxy Username:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Proxy Password:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
-msgid "Network"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Version: "
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:78
-msgid "Copyright"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Plugins"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "URL:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "Group By"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Sort by..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Format"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3305
-msgid "Ascending"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3306
-msgid "Descending"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
-#: ../plugins/converter/interface.c:750
-msgid "Select DSP Plugin"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
-#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
-#: ../plugins/gtkui/dspconfig.c:139
-msgid "Plugin"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Tag Writer Settings"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Write ID3v2"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
-#: ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Write ID3v1"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
-#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Write APEv2"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Strip ID3v2"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
-#: ../plugins/gtkui/deadbeef.glade.h:129
-msgid "Strip ID3v1"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
-#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Strip APEv2"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "ID3v2 version"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3531
-msgid "2.3 (Recommended)"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3532
-msgid "2.4"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Write ID3v2.4"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
-msgid "Artist / Album"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
-msgid "Track No"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:338
-msgid "Delete files from disk"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:339
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:340 ../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:444
-msgid "Add to playback queue"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:449
-msgid "Remove from playback queue"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:457
-msgid "Reload metadata"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:476
-msgid "Remove from disk"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
-msgid "Add column"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
-msgid "Edit column"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:988
-msgid "Remove column"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:998
-msgid "Group by"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:1005
-msgid "None"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:1009
-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:641
-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:91
-#, c-format
-msgid "Usage: deadbeef [options] [file(s)]\n"
-msgstr ""
-
-#: ../main.c:92
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../main.c:93
-#, c-format
-msgid "   --help  or  -h     Print help (this message) and exit\n"
-msgstr ""
-
-#: ../main.c:94
-#, c-format
-msgid "   --quit             Quit player\n"
-msgstr ""
-
-#: ../main.c:95
-#, c-format
-msgid "   --version          Print version info and exit\n"
-msgstr ""
-
-#: ../main.c:96
-#, c-format
-msgid "   --play             Start playback\n"
-msgstr ""
-
-#: ../main.c:97
-#, c-format
-msgid "   --stop             Stop playback\n"
-msgstr ""
-
-#: ../main.c:98
-#, c-format
-msgid "   --pause            Pause playback\n"
-msgstr ""
-
-#: ../main.c:99
-#, c-format
-msgid "   --toggle-pause     Toggle pause\n"
-msgstr ""
-
-#: ../main.c:100
-#, c-format
-msgid ""
-"   --play-pause       Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-
-#: ../main.c:101
-#, c-format
-msgid "   --next             Next song in playlist\n"
-msgstr ""
-
-#: ../main.c:102
-#, c-format
-msgid "   --prev             Previous song in playlist\n"
-msgstr ""
-
-#: ../main.c:103
-#, c-format
-msgid "   --random           Random song in playlist\n"
-msgstr ""
-
-#: ../main.c:104
-#, c-format
-msgid "   --queue            Append file(s) to existing playlist\n"
-msgstr ""
-
-#: ../main.c:105
-#, c-format
-msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
-msgstr ""
-
-#: ../main.c:106
-#, c-format
-msgid ""
-"                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
-"                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
-"                      copy[r]ight, [e]lapsed\n"
-msgstr ""
-
-#: ../main.c:109
-#, c-format
-msgid ""
-"                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-
-#: ../main.c:110
-#, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
-msgstr ""
-
-#: ../playlist.c:454 ../playlist.c:2398
-msgid "Default"
-msgstr ""
-
-#: ../playlist.c:3664
-msgid "Yes"
-msgstr ""
-
-#: ../playlist.c:3664
-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:56
-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:68
-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:94
-msgid "Output folder:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:115
-msgid "Output file name:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:126
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-
-#: ../plugins/converter/interface.c:139
-msgid "Encoder:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:163
-msgid "DSP preset:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:186
-msgid "Number of threads:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:199
-msgid "Output sample format:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:206
-msgid "Keep source format"
-msgstr ""
-
-#: ../plugins/converter/interface.c:207
-msgid "8 bit signed int"
-msgstr ""
-
-#: ../plugins/converter/interface.c:208
-msgid "16 bit signed int"
-msgstr ""
-
-#: ../plugins/converter/interface.c:209
-msgid "24 bit signed int"
-msgstr ""
-
-#: ../plugins/converter/interface.c:210
-msgid "32 bit signed int"
-msgstr ""
-
-#: ../plugins/converter/interface.c:211
-msgid "32 bit float"
-msgstr ""
-
-#: ../plugins/converter/interface.c:217
-msgid "When file exists:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:224
-msgid "Prompt"
-msgstr ""
-
-#: ../plugins/converter/interface.c:225
-msgid "Overwrite"
-msgstr ""
-
-#: ../plugins/converter/interface.c:227
-msgid "Preserve folder structure, starting from:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:379
-msgid "Edit Encoder Preset"
-msgstr ""
-
-#: ../plugins/converter/interface.c:402
-msgid "Untitled Encoder"
-msgstr ""
-
-#: ../plugins/converter/interface.c:410
-msgid "Output file extension:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:417
-msgid "E.g. mp3"
-msgstr ""
-
-#: ../plugins/converter/interface.c:425
-msgid "Command line:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:436
-#, c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
-msgstr ""
-
-#: ../plugins/converter/interface.c:446
-#, c-format
-msgid ""
-"<small>%o - output file name\n"
-"%i - temporary input file name</small>"
-msgstr ""
-
-#: ../plugins/converter/interface.c:455
-msgid "Method:"
-msgstr ""
-
-#: ../plugins/converter/interface.c:462
-msgid "Pipe"
-msgstr ""
-
-#: ../plugins/converter/interface.c:463
-msgid "Temporary file"
-msgstr ""
-
-#: ../plugins/converter/interface.c:480
-msgid "APEv2"
-msgstr ""
-
-#: ../plugins/converter/interface.c:486
-msgid "ID3v1"
-msgstr ""
-
-#: ../plugins/converter/interface.c:492
-msgid "OggVorbis"
-msgstr ""
-
-#: ../plugins/converter/interface.c:498
-msgid "FLAC"
-msgstr ""
-
-#: ../plugins/converter/interface.c:510
-msgid "ID3v2"
-msgstr ""
-
-#: ../plugins/converter/interface.c:520
-msgid "<b>Tag writer</b>"
-msgstr ""
-
-#: ../plugins/converter/interface.c:606
-msgid "DSP Preset Editor"
-msgstr ""
-
-#: ../plugins/converter/interface.c:629
-msgid "Untitled DSP Preset"
-msgstr ""
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index 36f2665e..6a047023 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -13,7 +13,7 @@ sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 make clean
 make -j9
 
-./scripts/portable_extraplugs.sh
+#./scripts/portable_extraplugs.sh
 
 cd $ORIGIN
 
diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh
index be8c75b6..2b8e5465 100755
--- a/scripts/portable_package_static.sh
+++ b/scripts/portable_package_static.sh
@@ -49,11 +49,11 @@ tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\
     $PLUGDIR/vtx.so\
     $PLUGDIR/wavpack.so\
     $PLUGDIR/wildmidi.so\
-    $PLUGDIR/ao.so\
-    $PLUGDIR/shn.so\
-    $PLUGDIR/dumb.so\
+    $PLUGDIR/ddb_ao.so\
+    $PLUGDIR/ddb_shn.so\
+    $PLUGDIR/ddb_dumb.so\
     $PLUGDIR/converter.so\
-    $PLUGDIR/converter_gtkui.so\
+    $PLUGDIR/converter_gtk2.so\
     $PLUGDIR/convpresets\
     $PLUGDIR/pulse.so\
     $PLUGDIR/dsp_libsrc.so\
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index ae9b7ec1..f572240f 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -24,12 +24,17 @@ for i in nullout cdda flac alsa mpgmad hotkeys vtx \
 		 cp ./plugins/$i/.libs/$i.so $PLUGDIR/
 	elif [ -f ./plugins/$i/$i.so ]; then
 		 cp ./plugins/$i/$i.so $PLUGDIR/
+	elif [ -f ./plugins/$i/.libs/ddb_$i.so ]; then
+		 cp ./plugins/$i/.libs/ddb_$i.so $PLUGDIR/
 	else
 		echo ./plugins/$i/.libs/$i.so not found
 	fi
 
-    if [ -f ./plugins/$i/.libs/${i}_gtkui.so ]; then
-		 cp ./plugins/$i/.libs/${i}_gtkui.so $PLUGDIR/
+    if [ -f ./plugins/$i/.libs/${i}_gtk2.so ]; then
+		 cp ./plugins/$i/.libs/${i}_gtk2.so $PLUGDIR/
+    fi
+    if [ -f ./plugins/$i/.libs/${i}_gtk3.so ]; then
+		 cp ./plugins/$i/.libs/${i}_gtk3.so $PLUGDIR/
     fi
 
     if [ -f ./plugins/$i/.libs/$i.fallback.so ]; then