added support for additional tags

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1112 90c681e8-e032-0410-971d-27865f9a5e38

33 files changed, 410 insertions, 174 deletions

diff --git a/src/plugins/Input/mad/translations/mad_plugin_ru.ts b/src/plugins/Input/mad/translations/mad_plugin_ru.ts
index 5862bdc93..1e24b2f17 100644
--- a/src/plugins/Input/mad/translations/mad_plugin_ru.ts
+++ b/src/plugins/Input/mad/translations/mad_plugin_ru.ts
@@ -140,7 +140,7 @@
     <message>
         <location filename="../detailsdialog.ui" line="189"/>
         <source>Composer:</source>
-        <translation>Композитр:</translation>
+        <translation>Композитор:</translation>
     </message>
     <message>
         <location filename="../detailsdialog.ui" line="231"/>
diff --git a/src/qmmp/abstractdetailsdialog.cpp b/src/qmmp/abstractdetailsdialog.cpp
index 4840e200f..52ce062ef 100644
--- a/src/qmmp/abstractdetailsdialog.cpp
+++ b/src/qmmp/abstractdetailsdialog.cpp
@@ -66,12 +66,18 @@ void AbstractDetailsDialog::setMetaData(Qmmp::MetaData key, const QString &value
     case Qmmp::GENRE:
         ui->genreLineEdit->setText(value);
         break;
+    case Qmmp::COMPOSER:
+        return ui->composerLineEdit->setText(value);
+        break;
     case Qmmp::YEAR:
         ui->yearSpinBox->setValue(value.toInt());
         break;
     case Qmmp::TRACK:
         ui->trackSpinBox->setValue(value.toInt());
         break;
+    case Qmmp::DISCNUMBER:
+        ui->discSpinBox->setValue(value.toInt());
+        break;
     case Qmmp::URL:
         ui->pathLineEdit->setText(value);
         setWindowTitle (value.section('/',-1));
@@ -127,13 +133,17 @@ const QString AbstractDetailsDialog::strMetaData(Qmmp::MetaData key)
     case Qmmp::ALBUM:
         return ui->albumLineEdit->text();
     case Qmmp::COMMENT:
-        return ui->commentBrowser->toPlainText();
+        return ui->commentBrowser->toPlainText();    
     case Qmmp::GENRE:
         return ui->genreLineEdit->text();
+    case Qmmp::COMPOSER:
+        return ui->composerLineEdit->text();
     case Qmmp::YEAR:
         return QString("%1").arg(ui->yearSpinBox->value());
     case Qmmp::TRACK:
         return QString("%1").arg(ui->trackSpinBox->value());
+    case Qmmp::DISCNUMBER:
+        return QString("%1").arg(ui->discSpinBox->value());
     case Qmmp::URL:
         return ui->pathLineEdit->text();
     }
diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h
index 2b846919e..89f799a14 100644
--- a/src/qmmp/qmmp.h
+++ b/src/qmmp/qmmp.h
@@ -50,8 +50,10 @@ public:
         ALBUM,     /*!< Album */
         COMMENT,   /*!< Comment */
         GENRE,     /*!< Genre */
+        COMPOSER,  /*!< Composer */
         YEAR,      /*!< Year */
         TRACK,     /*!< Track number */
+        DISCNUMBER,/*!< Disc number */
         URL        /*!< Stream url or local file path */
     };
     /*!
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index 1605e41a8..574518357 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -5,9 +5,9 @@ HEADERS += recycler.h \
     decoder.h \
     output.h \
     outputfactory.h \
-    equ\iir_cfs.h \
-    equ\iir_fpu.h \
-    equ\iir.h \
+    equ/iir_cfs.h \
+    equ/iir_fpu.h \
+    equ/iir.h \
     decoderfactory.h \
     soundcore.h \
     streamreader.h \
@@ -25,9 +25,9 @@ HEADERS += recycler.h \
 SOURCES += recycler.cpp \
     decoder.cpp \
     output.cpp \
-    equ\iir.c \
-    equ\iir_cfs.c \
-    equ\iir_fpu.c \
+    equ/iir.c \
+    equ/iir_cfs.c \
+    equ/iir_fpu.c \
     soundcore.cpp \
     streamreader.cpp \
     downloader.cpp \
diff --git a/src/qmmp/translations/libqmmp_ru.ts b/src/qmmp/translations/libqmmp_ru.ts
index 1f498ccc9..5710fcb5c 100644
--- a/src/qmmp/translations/libqmmp_ru.ts
+++ b/src/qmmp/translations/libqmmp_ru.ts
@@ -36,7 +36,7 @@
     <message>
         <location filename="../forms/abstractdetailsdialog.ui" line="159"/>
         <source>Composer:</source>
-        <translation>Композитр:</translation>
+        <translation>Композитор:</translation>
     </message>
     <message>
         <location filename="../forms/abstractdetailsdialog.ui" line="175"/>
diff --git a/src/qmmpui/abstractplaylistitem.cpp b/src/qmmpui/abstractplaylistitem.cpp
index 164d7c500..4c8a0f561 100644
--- a/src/qmmpui/abstractplaylistitem.cpp
+++ b/src/qmmpui/abstractplaylistitem.cpp
@@ -54,6 +54,11 @@ const QString AbstractPlaylistItem::genre () const
     return m_metaData.value(Qmmp::GENRE);
 }
 
+const QString AbstractPlaylistItem::composer() const
+{
+    return m_metaData.value(Qmmp::COMPOSER);
+}
+
 const QString AbstractPlaylistItem::track () const
 {
     return m_metaData.value(Qmmp::TRACK);
@@ -64,6 +69,11 @@ const QString AbstractPlaylistItem::year () const
     return m_metaData.value(Qmmp::YEAR);
 }
 
+const QString AbstractPlaylistItem::discNumber () const
+{
+    return m_metaData.value(Qmmp::DISCNUMBER);
+}
+
 const QString AbstractPlaylistItem::url () const
 {
     return m_metaData.value(Qmmp::URL);
diff --git a/src/qmmpui/abstractplaylistitem.h b/src/qmmpui/abstractplaylistitem.h
index 2294ff73a..149291ace 100644
--- a/src/qmmpui/abstractplaylistitem.h
+++ b/src/qmmpui/abstractplaylistitem.h
@@ -55,10 +55,14 @@ public:
      */
     const QString comment () const;
     /*!
-     * Returns gnere.
+     * Returns genre.
      */
     const QString genre () const;
     /*!
+     * Returns composer.
+     */
+    const QString composer() const;
+    /*!
      * Returns track number.
      */
     const QString track () const;
@@ -67,6 +71,10 @@ public:
      */
     const QString year () const;
     /*!
+     * Returns disc number.
+     */
+    const QString discNumber () const;
+    /*!
      * Returns stream url or local file path.
      */
     const QString url () const;
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 7912c502b..bacd3f803 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -114,8 +114,11 @@ void PlayListItem::readMetadata()
     m_title = printTag(m_title, "%p", artist());
     m_title = printTag(m_title, "%a", album());
     m_title = printTag(m_title, "%t", title());
-    m_title = printTag(m_title, "%n", QString("%1").arg(track()));
+    m_title = printTag(m_title, "%n", track());
+    m_title = printTag(m_title, "%c", comment());
+    m_title = printTag(m_title, "%C", composer());
     m_title = printTag(m_title, "%g", genre());
+    m_title = printTag(m_title, "%D", discNumber());
     m_title = printTag(m_title, "%f", url().section('/',-1));
     m_title = printTag(m_title, "%F", url());
     m_title = printTag(m_title, "%y", QString("%1").arg(year ()));
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index e0fc19ea3..539ed12e7 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -366,13 +366,17 @@ void PlayListModel::showDetails()
                 str.append(tr("Artist:") + " %3\n");
                 str.append(tr("Album:") + " %4\n");
                 str.append(tr("Genre:") + " %5\n");
-                str.append(tr("Comment:") + " %6");
+                str.append(tr("Comment:") + " %6\n");
+                str.append(tr("Composer:") + " %7\n");
+                str.append(tr("Disc number:") + " %8");
                 str = str.arg(item->url())
                       .arg(item->title().isEmpty() ? item->text() : item->title())
                       .arg(item->artist())
                       .arg(item->album())
                       .arg(item->genre())
-                      .arg(item->comment());
+                      .arg(item->comment())
+                      .arg(item->composer())
+                      .arg(item->discNumber());
                 QMessageBox::information(0, m_items.at(i)->url(), str);
                 return;
             }
@@ -430,10 +434,14 @@ void PlayListModel::readSettings()
             infoList.last()->setMetaData(Qmmp::COMMENT, value);
         else if (param == "genre")
             infoList.last()->setMetaData(Qmmp::GENRE, value);
+        else if (param == "composer")
+            infoList.last()->setMetaData(Qmmp::COMPOSER, value);
         else if (param == "year")
             infoList.last()->setMetaData(Qmmp::YEAR, value);
         else if (param == "track")
             infoList.last()->setMetaData(Qmmp::TRACK, value);
+        else if (param == "disc")
+            infoList.last()->setMetaData(Qmmp::DISCNUMBER, value);
         else if (param == "length")
             infoList.last()->setLength(value.toInt());
     }
@@ -459,9 +467,11 @@ void PlayListModel::writeSettings()
         file.write(QString("album=%1").arg(m->album()).toUtf8() +"\n");
         file.write(QString("comment=%1").arg(m->comment()).toUtf8() +"\n");
         file.write(QString("genre=%1").arg(m->genre()).toUtf8() +"\n");
+        file.write(QString("composer=%1").arg(m->composer()).toUtf8() +"\n");
         file.write(QString("year=%1").arg(m->year()).toUtf8() +"\n");
         file.write(QString("track=%1").arg(m->track()).toUtf8() +"\n");
-        file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n");
+        file.write(QString("disc=%1").arg(m->discNumber()).toUtf8() +"\n");
+        file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n");        
     }
     file.close();
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 6b838f9c1..0df987e55 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -418,7 +418,8 @@ public slots:
     /*!
      * Sets short title format
      * @param format title format. (Expressions: "%p" - artist, "%a" - album, "%t" - title, "%n" - track,
-     * "%g" - genre, "%f" - file name, "%F" - full path, "%y" - year)
+     * "%g" - genre, "%c" - comment, "%C" - composer, "%D" - disc number "%f" - file name, "
+     * %F" - full path, "%y" - year)
      */
     void setFormat(const QString &format);
     /*!
diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts
index 38157ed0c..156be2117 100644
--- a/src/qmmpui/translations/libqmmpui_cs.ts
+++ b/src/qmmpui/translations/libqmmpui_cs.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Poznámka:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts
index 7b9496879..034a5d98f 100644
--- a/src/qmmpui/translations/libqmmpui_de.ts
+++ b/src/qmmpui/translations/libqmmpui_de.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts
index 083e66552..96e14ea2d 100644
--- a/src/qmmpui/translations/libqmmpui_it.ts
+++ b/src/qmmpui/translations/libqmmpui_it.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Commento:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts
index 5e248b3d2..97c4d5be3 100644
--- a/src/qmmpui/translations/libqmmpui_lt.ts
+++ b/src/qmmpui/translations/libqmmpui_lt.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Komantaras:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts
index 8fcbd9fed..da18f1588 100644
--- a/src/qmmpui/translations/libqmmpui_pl.ts
+++ b/src/qmmpui/translations/libqmmpui_pl.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Komentarz:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts
index ecdd051dd..df6805917 100644
--- a/src/qmmpui/translations/libqmmpui_pt_BR.ts
+++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts
index 9f64635e5..b401dcb92 100644
--- a/src/qmmpui/translations/libqmmpui_ru.ts
+++ b/src/qmmpui/translations/libqmmpui_ru.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts
index 01a092250..ff98b2461 100644
--- a/src/qmmpui/translations/libqmmpui_tr.ts
+++ b/src/qmmpui/translations/libqmmpui_tr.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Yorum:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts
index 5b101ddfd..d544bec63 100644
--- a/src/qmmpui/translations/libqmmpui_uk_UA.ts
+++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>Коментар:</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts
index 14ec10c35..925b1e51a 100644
--- a/src/qmmpui/translations/libqmmpui_zh_CN.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>备注：</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts
index 9a2a85dd8..950477659 100644
--- a/src/qmmpui/translations/libqmmpui_zh_TW.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts
@@ -33,6 +33,16 @@
         <source>Comment:</source>
         <translation>備註：</translation>
     </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="370"/>
+        <source>Composer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../playlistmodel.cpp" line="371"/>
+        <source>Disc number:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtFileDialogFactory</name>
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index 5a0a31a46..e1e033971 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -534,13 +534,16 @@ void ConfigDialog::createMenus()
     menu->addAction(tr("Artist"))->setData("%p");
     menu->addAction(tr("Album"))->setData("%a");
     menu->addAction(tr("Title"))->setData("%t");
-    menu->addAction(tr("Tracknumber"))->setData("%n");
+    menu->addAction(tr("Track number"))->setData("%n");
+    menu->addAction(tr("Disc number"))->setData("%D");
     menu->addAction(tr("Genre"))->setData("%g");
+    menu->addAction(tr("Composer"))->setData("%C");
     menu->addAction(tr("Filename"))->setData("%f");
     menu->addAction(tr("Filepath"))->setData("%F");
-    menu->addAction(tr("Date"))->setData("%d");
+    menu->addAction(tr("Date"))->setData("%d"); //TODO fix this
     menu->addAction(tr("Year"))->setData("%y");
     menu->addAction(tr("Comment"))->setData("%c");
+
     ui.titleButton->setMenu(menu);
     ui.titleButton->setPopupMode(QToolButton::InstantPopup);
     connect( menu, SIGNAL(triggered ( QAction * )), SLOT(addTitleString( QAction * )));
diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts
index 049c1b2fd..e1ab0a261 100644
--- a/src/ui/translations/qmmp_cs.ts
+++ b/src/ui/translations/qmmp_cs.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Soubor</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Číslo stopy</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Žánr</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>Převést %20 na mezery</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Zobrazit plnou cestu k streamu</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Vybrat soubory s tématy</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Soubory s tématy</translation>
     </message>
diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts
index 6f72f387d..32cd9aa65 100644
--- a/src/ui/translations/qmmp_de.ts
+++ b/src/ui/translations/qmmp_de.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Titelnummer</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Genre</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Dateipfad</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>%20 in Leerzeichen umwandeln</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Vollständigen Pfad anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Design-Dateien auswählen</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Design-Dateien</translation>
     </message>
diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts
index 86d333bfe..3e1c7021d 100644
--- a/src/ui/translations/qmmp_it.ts
+++ b/src/ui/translations/qmmp_it.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>File</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Numero della traccia</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Genere</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Percorso</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Anno</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Commento</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>Converti il carattere « %20 » in spazi</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Mostra il percorso completo di un flusso</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Seleziona aspetto</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Aspetto</translation>
     </message>
@@ -1172,29 +1178,6 @@
     </message>
 </context>
 <context>
-    <name>PlayListModel</name>
-    <message>
-        <source>Url:</source>
-        <translation type="obsolete">URL: </translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="obsolete">Titolo: </translation>
-    </message>
-    <message>
-        <source>Artist:</source>
-        <translation type="obsolete">Interprete: </translation>
-    </message>
-    <message>
-        <source>Album:</source>
-        <translation type="obsolete">Album: </translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="obsolete">Commento: </translation>
-    </message>
-</context>
-<context>
     <name>PresetEditor</name>
     <message>
         <location filename="../forms/preseteditor.ui" line="13"/>
diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts
index a0996f277..b0e8c20df 100644
--- a/src/ui/translations/qmmp_lt.ts
+++ b/src/ui/translations/qmmp_lt.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Bylos pavadinimas</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Takelio numeris</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Žanras</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Bylos kelias</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Metai</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Komentaras</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>Convert %20 to blanks</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Rodyti pilną srauto kelią</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Pasirinkti temų bylas</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Temų bylos</translation>
     </message>
@@ -786,10 +792,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vidutinis</source>
-        <translation type="obsolete">Среднее</translation>
-    </message>
-    <message>
         <location filename="../mainvisual.cpp" line="348"/>
         <location filename="../mainvisual.cpp" line="362"/>
         <source>Fast</source>
@@ -1221,10 +1223,6 @@
         <translation>Parodyti versiją ir išeiti</translation>
     </message>
     <message>
-        <source>Ideas, patches, bugreports send to butkus.algirdas@gmail.com</source>
-        <translation type="obsolete">Idėjos, pataisymai, klaidos:  butkus.algirdas@gmail.com</translation>
-    </message>
-    <message>
         <location filename="../qmmpstarter.cpp" line="158"/>
         <source>Display this text and exit</source>
         <translation>Parodyti šį tekstą ir išeiti</translation>
diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts
index 828f0e846..0df17872f 100644
--- a/src/ui/translations/qmmp_pl_PL.ts
+++ b/src/ui/translations/qmmp_pl_PL.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Nazwa pliku</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Numer utworu</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Gatunek</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Ścieżka pliku</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>Konwertuj sekwencje %20 na spacje</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Pokaż pełną ścieżkę strumienia</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Wybierz skórę</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Pliki skór</translation>
     </message>
diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts
index 94c73f66f..99a4f4957 100644
--- a/src/ui/translations/qmmp_pt_BR.ts
+++ b/src/ui/translations/qmmp_pt_BR.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation type="unfinished">Nome do Arquivo</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation type="unfinished">Número da faixa</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation type="unfinished">Gênero</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation type="unfinished">Pasta do arquivo</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation type="unfinished">Comentário</translation>
     </message>
@@ -471,12 +481,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts
index 9a3ca042a..b59da6e14 100644
--- a/src/ui/translations/qmmp_ru.ts
+++ b/src/ui/translations/qmmp_ru.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Номер трека</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Жанр</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Путь к файлу</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>Преобразовывать %20 в пробел</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Показывать полный путь для потоков</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Выберите файлы обложек</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Файлы обложек</translation>
     </message>
diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts
index 05091bfd1..a6374b91e 100644
--- a/src/ui/translations/qmmp_tr.ts
+++ b/src/ui/translations/qmmp_tr.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Dosya adı</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Parça Numarası</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Tarz</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Dosya yolu</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Yıl</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Yorum</translation>
     </message>
@@ -471,12 +481,12 @@
         <translation>%20 yi boşluğa çevir</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Kabuk Dosyası Seç</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Kabuk dosyaları</translation>
     </message>
diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts
index 63bee655b..b0954c621 100644
--- a/src/ui/translations/qmmp_uk_UA.ts
+++ b/src/ui/translations/qmmp_uk_UA.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="uk">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="uk">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -173,17 +173,30 @@
 <context>
     <name>ConfigDialog</name>
     <message>
+        <location filename="../configdialog.cpp" line="222"/>
+        <location filename="../configdialog.cpp" line="252"/>
+        <location filename="../configdialog.cpp" line="284"/>
+        <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
         <source>Enabled</source>
         <translation>Увімкнено</translation>
     </message>
     <message>
+        <location filename="../configdialog.cpp" line="222"/>
+        <location filename="../configdialog.cpp" line="252"/>
+        <location filename="../configdialog.cpp" line="284"/>
+        <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
         <source>Description</source>
         <translation>Пояснення</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="222"/>
+        <location filename="../configdialog.cpp" line="252"/>
+        <location filename="../configdialog.cpp" line="284"/>
+        <location filename="../configdialog.cpp" line="317"/>
+        <location filename="../configdialog.cpp" line="350"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>Им&apos;я файлу</translation>
     </message>
@@ -204,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>Номер треку</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>Жанр</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>Шлях до файлу</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>Рік</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>Коментар</translation>
     </message>
@@ -258,11 +281,14 @@
         <translation>Список:</translation>
     </message>
     <message>
+        <location filename="../forms/configdialog.ui" line="259"/>
         <location filename="../forms/configdialog.ui" line="295"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
+        <location filename="../forms/configdialog.ui" line="266"/>
+        <location filename="../forms/configdialog.ui" line="302"/>
         <location filename="../forms/configdialog.ui" line="357"/>
         <source>...</source>
         <translation>...</translation>
@@ -303,6 +329,7 @@
         <translation>Налаштування</translation>
     </message>
     <message>
+        <location filename="../forms/configdialog.ui" line="446"/>
         <location filename="../forms/configdialog.ui" line="638"/>
         <source>Information</source>
         <translation>Інформація</translation>
@@ -313,6 +340,7 @@
         <translation>Зовнішній вигляд</translation>
     </message>
     <message>
+        <location filename="../forms/configdialog.ui" line="101"/>
         <location filename="../forms/configdialog.ui" line="721"/>
         <source>Playlist</source>
         <translation>Список</translation>
@@ -453,16 +481,12 @@
         <translation>Конвертувати %20 в пробіл</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">Показувати повний шлях для потоків</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>Вибрати файли скінів</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>Файли скінів</translation>
     </message>
@@ -492,6 +516,8 @@
         <translation>Головне вікно</translation>
     </message>
     <message>
+        <location filename="../forms/configdialog.ui" line="690"/>
+        <location filename="../forms/configdialog.ui" line="714"/>
         <location filename="../forms/configdialog.ui" line="738"/>
         <source>0</source>
         <translation></translation>
@@ -505,6 +531,7 @@
 <context>
     <name>EqWidget</name>
     <message>
+        <location filename="../eqwidget.cpp" line="157"/>
         <location filename="../eqwidget.cpp" line="180"/>
         <source>preset</source>
         <translation>предвстановлення</translation>
@@ -558,11 +585,14 @@
 <context>
     <name>JumpToTrackDialog</name>
     <message>
+        <location filename="../jumptotrackdialog.cpp" line="81"/>
         <location filename="../jumptotrackdialog.cpp" line="137"/>
         <source>Unqueue</source>
         <translation>Зняти з черги</translation>
     </message>
     <message>
+        <location filename="../forms/jumptotrackdialog.ui" line="79"/>
+        <location filename="../jumptotrackdialog.cpp" line="83"/>
         <location filename="../jumptotrackdialog.cpp" line="139"/>
         <source>Queue</source>
         <translation>В чергу</translation>
@@ -744,26 +774,31 @@
         <translation>Падіння аналізатора</translation>
     </message>
     <message>
+        <location filename="../mainvisual.cpp" line="345"/>
         <location filename="../mainvisual.cpp" line="359"/>
         <source>Slowest</source>
         <translation>Найповільніше</translation>
     </message>
     <message>
+        <location filename="../mainvisual.cpp" line="346"/>
         <location filename="../mainvisual.cpp" line="360"/>
         <source>Slow</source>
         <translation>Повільне</translation>
     </message>
     <message>
+        <location filename="../mainvisual.cpp" line="347"/>
         <location filename="../mainvisual.cpp" line="361"/>
         <source>Medium</source>
         <translation>Середнє</translation>
     </message>
     <message>
+        <location filename="../mainvisual.cpp" line="348"/>
         <location filename="../mainvisual.cpp" line="362"/>
         <source>Fast</source>
         <translation>Швидке</translation>
     </message>
     <message>
+        <location filename="../mainvisual.cpp" line="349"/>
         <location filename="../mainvisual.cpp" line="363"/>
         <source>Fastest</source>
         <translation>Найшвидше</translation>
@@ -787,6 +822,7 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../mainwindow.cpp" line="63"/>
         <location filename="../mainwindow.cpp" line="496"/>
         <source>Default</source>
         <translation>За умовчанням</translation>
@@ -897,6 +933,7 @@
         <translation>&amp;Про програму</translation>
     </message>
     <message>
+        <location filename="../mainwindow.cpp" line="508"/>
         <location filename="../mainwindow.cpp" line="534"/>
         <source>Playlist Files</source>
         <translation>Файли списків</translation>
@@ -1025,21 +1062,25 @@
         <translation>Сортувати</translation>
     </message>
     <message>
+        <location filename="../playlist.cpp" line="186"/>
         <location filename="../playlist.cpp" line="213"/>
         <source>By Title</source>
         <translation>За назвою</translation>
     </message>
     <message>
+        <location filename="../playlist.cpp" line="190"/>
         <location filename="../playlist.cpp" line="217"/>
         <source>By Filename</source>
         <translation>За ім&apos;ям файлу</translation>
     </message>
     <message>
+        <location filename="../playlist.cpp" line="194"/>
         <location filename="../playlist.cpp" line="221"/>
         <source>By Path + Filename</source>
         <translation>За шляхом та файлом</translation>
     </message>
     <message>
+        <location filename="../playlist.cpp" line="198"/>
         <location filename="../playlist.cpp" line="225"/>
         <source>By Date</source>
         <translation>За датою</translation>
@@ -1115,6 +1156,7 @@
         <translation></translation>
     </message>
     <message>
+        <location filename="../playlist.cpp" line="202"/>
         <location filename="../playlist.cpp" line="229"/>
         <source>By Track Number</source>
         <translation></translation>
diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts
index 47e92117b..caf3589da 100644
--- a/src/ui/translations/qmmp_zh_CN.ts
+++ b/src/ui/translations/qmmp_zh_CN.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>音轨</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>流派</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>文件路径</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>年代</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>备注</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>转换 %20 为空格</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">显示媒体流的完整路径</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>选择皮肤文件</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>皮肤文件</translation>
     </message>
diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts
index 59d8adc9e..c49761bd0 100644
--- a/src/ui/translations/qmmp_zh_TW.ts
+++ b/src/ui/translations/qmmp_zh_TW.ts
@@ -196,7 +196,7 @@
         <location filename="../configdialog.cpp" line="284"/>
         <location filename="../configdialog.cpp" line="317"/>
         <location filename="../configdialog.cpp" line="350"/>
-        <location filename="../configdialog.cpp" line="539"/>
+        <location filename="../configdialog.cpp" line="541"/>
         <source>Filename</source>
         <translation>檔名</translation>
     </message>
@@ -217,31 +217,41 @@
     </message>
     <message>
         <location filename="../configdialog.cpp" line="537"/>
-        <source>Tracknumber</source>
-        <translation>音軌</translation>
+        <source>Track number</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="538"/>
+        <source>Disc number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="539"/>
         <source>Genre</source>
         <translation>流派</translation>
     </message>
     <message>
         <location filename="../configdialog.cpp" line="540"/>
+        <source>Composer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="542"/>
         <source>Filepath</source>
         <translation>檔案路徑</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="541"/>
+        <location filename="../configdialog.cpp" line="543"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="542"/>
+        <location filename="../configdialog.cpp" line="544"/>
         <source>Year</source>
         <translation>年代</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="543"/>
+        <location filename="../configdialog.cpp" line="545"/>
         <source>Comment</source>
         <translation>備註</translation>
     </message>
@@ -471,16 +481,12 @@
         <translation>轉換 %20 為空格</translation>
     </message>
     <message>
-        <source>Show full path of a stream</source>
-        <translation type="obsolete">察看媒體流的完整路徑</translation>
-    </message>
-    <message>
-        <location filename="../configdialog.cpp" line="662"/>
+        <location filename="../configdialog.cpp" line="665"/>
         <source>Select Skin Files</source>
         <translation>選取皮膚檔案</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="663"/>
+        <location filename="../configdialog.cpp" line="666"/>
         <source>Skin files</source>
         <translation>皮膚檔案</translation>
     </message>