removed broken LyricWiki.org support, added lyricsplugin.com instead

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

13 files changed, 132 insertions, 226 deletions

diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 5fef65803..1ac6d28e8 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -49,7 +49,7 @@ void LyricsFactory::showAbout(QWidget *parent)
 {
     QMessageBox::about (parent, tr("About Lyrics Plugin"),
                         tr("Qmmp Lyrics Plugin")+"\n"+
-                        tr("This plugin retrieves lyrics from LyricWiki.org")+"\n"+
+                        tr("This plugin retrieves lyrics from lyricsplugin.com")+"\n"+
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
 }
 
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index 04fb7f330..a3c9262bd 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -28,7 +28,6 @@
 LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget *parent)
         : QWidget(parent)
 {
-    m_parse_url = FALSE;
     ui.setupUi(this);
     setWindowFlags(Qt::Dialog);
     setAttribute(Qt::WA_DeleteOnClose);
@@ -57,52 +56,28 @@ void LyricsWindow::showText(bool error)
     if (error)
     {
         ui.textEdit->setText(m_http->errorString());
-        m_parse_url = FALSE;
         return;
     }
     QString content = QString::fromUtf8(m_http->readAll().constData());
-    if(m_parse_url)
-    {
-        QRegExp url_regexp("<a href=\\'([^\\']*)\\' title=\\'url\\'>");
-        if(url_regexp.indexIn(content) > 1)
-        {
-            QString url = qPrintable(url_regexp.cap(1));
-            qDebug("LyricsWindow: url1=%s", qPrintable(url));
-            if(url.endsWith("action=edit"))
-                ui.textEdit->setHtml("<b>"+tr("Not found")+"</b>");
-            else
-            {
-                url.replace("lyricwiki.org", "lyrics.wikia.com/lyrics");
-                m_http->setHost("lyrics.wikia.com");
-                qDebug("LyricsWindow: url2=%s", qPrintable(url));
-                m_http->get(url);
-            }
-        }
-        else
-            ui.textEdit->setHtml("<b>"+tr("Error")+"</b>");
-    }
+
+    QRegExp artist_regexp("<div id=\\\"artist\\\">([^<]*)</div>");
+    QRegExp title_regexp("<div id=\\\"title\\\">([^<]*)</div>");
+    QRegExp lyrics_regexp("<div id=\\\"lyrics\\\">([^<]*)</div>");
+    artist_regexp.indexIn(content);
+    title_regexp.indexIn(content);
+    content.replace("<br />", "[br /]");
+    lyrics_regexp.indexIn(content);
+
+    QString text = "<h2>" +artist_regexp.cap(1) + " - " + title_regexp.cap(1) + "</h2>";
+    QString lyrics = lyrics_regexp.cap(1);
+    lyrics.replace("[br /]", "<br />");
+    if(lyrics.trimmed().isEmpty())
+        ui.textEdit->setHtml("<b>" + tr("Not found") + "</b>");
     else
     {
-        QRegExp caption_regexp("<h1 class=\\\"firstHeading\\\">([^<]*)</h1>");
-        caption_regexp.indexIn(content);
-        QString text = "<h2>" + caption_regexp.cap(1) + "</h2>";
-        text.replace(":", " - ");
-        int lyric_begin = content.indexOf("<div class='lyricbox' >");
-        if(lyric_begin > 0)
-        {
-            int lyric_end = content.indexOf("</div>", lyric_begin);
-            if(lyric_end > 0)
-            {
-                text.append(content.mid(lyric_begin, lyric_end - lyric_begin-6));
-                ui.textEdit->setHtml(text);
-            }
-            else
-                ui.textEdit->setHtml("<b>"+tr("Error")+"</b>");
-        }
-        else
-            ui.textEdit->setHtml("<b>"+tr("Error")+"</b>");
+        text += lyrics;
+        ui.textEdit->setHtml(text);
     }
-    m_parse_url = FALSE;
 }
 
 void LyricsWindow::showState(int state)
@@ -134,9 +109,8 @@ void LyricsWindow::showState(int state)
 
 void LyricsWindow::on_searchPushButton_clicked()
 {
-    m_http->setHost("lyricwiki.org");
+    m_http->setHost("www.lyricsplugin.com");
     setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()).arg(ui.titleLineEdit->text()));
-    m_http->get("/api.php?func=getSong&artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text())
-                +"&song=" + QUrl::toPercentEncoding(ui.titleLineEdit->text()) +"&fmt=html");
-    m_parse_url = TRUE;
+    m_http->get("/winamp03/plugin/?artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text())
+                +"&title=" + QUrl::toPercentEncoding(ui.titleLineEdit->text()));
 }
diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h
index 1e99f7b07..51e8218b3 100644
--- a/src/plugins/General/lyrics/lyricswindow.h
+++ b/src/plugins/General/lyrics/lyricswindow.h
@@ -44,7 +44,6 @@ private slots:
 
 private:
     Ui::LyricsWindow ui;
-    bool m_parse_url;
     QHttp *m_http;
 
 };
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
index 8247a441e..9b34d1a6f 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Tento modul získává texty písní z LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Tento modul získává texty písní z lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Text: %1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Nespojeno</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation>Nenalezeno</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Vyhledávám hostitele...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Připojuji se...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Zasílám požadavek...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Příjímám</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Připojeno</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Zavírám spojení...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
index 271ec2b7b..14ded51e7 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Dieses Modul empfängt Liedtexte von LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Dieses Modul empfängt Liedtexte von lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Liedtext: %1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Keine Verbindung</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation>Es kann kein Liedtext für dieses Stück gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Verbindung wird hergestellt ...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Anfrage wird gesendet ...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Daten werden empfangen</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Verbunden</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Verbindung wird beendet ...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
index b93b4b5eb..4daa98b38 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Modulo che permette di trovare testi di canzoni da LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Modulo che permette di trovare testi di canzoni da lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Testo: %1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Nessuna connessione</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Ricerca host</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Connessione...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Invio richiesta...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Ricezione</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Connesso</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Chiusura connessione...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
index 564c4dcd5..e2698d353 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Šis įskiepis atsiunčia dainų žodžius iš LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Šis įskiepis atsiunčia dainų žodžius iš lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Dainos tekstas: %1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Nėra ryšio</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Ieškau serverio...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Susijungiu...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Siunčiu užklausą...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Gaunu</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Susijungiau</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Atsijungiu...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
index 29572ac21..172c2ad77 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
@@ -33,8 +33,8 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Ta wtyczka ściąga teksty piosenek z LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Ta wtyczka ściąga teksty piosenek z lyricsplugin.com</translation>
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="53"/>
@@ -45,55 +45,48 @@
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation>Nie znaleziono</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Nie połączony</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Szukanie hosta...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Wysyłanie żądania...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Odbieranie</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Połączony</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Zamykanie połączenia...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Teksty: %1 - %2</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
index b3b10d568..22ed6ba07 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Этот модуль предназначен для получания текстов песен из LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Этот модуль предназначен для получания текстов песен из lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Текст песни: %1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Нет соединения</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Поиск сервера...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Отправка запроса...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Получение</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Соединено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Завершение соединения...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
index 2491495c6..c650efd79 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
@@ -33,8 +33,8 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Bu eklenti şarkı sözlerini LyricWiki.org adresinden alır</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Bu eklenti şarkı sözlerini lyricsplugin.com adresinden alır</translation>
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="53"/>
@@ -45,55 +45,48 @@
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Bağlantı yok</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Sunucu aranıyor...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>Bağlanıyor...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>İstek gönderiliyor...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Alınıyor</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>Bağlandı</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Bağlantı kapatılıyor...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Şarkı Sözü: %1 - %2</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
index 69d42f034..95fee4347 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_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>Lyrics</name>
     <message>
@@ -38,59 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>Цей модуль отримує тексти з LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>Цей модуль отримує тексти з lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>Тексти: %1 - %2</translation>
     </message>
     <message>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>Немає з&apos;єднання</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation>Не знайдено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation>Помилка</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>Пошук хоста...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>З&apos;єднання...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>Відсилання запиту...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>Отримання</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>З&apos;єднано</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>Закриття з&apos;єднання...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
index ffbae5b46..e3c947fbc 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>此插件使用的歌词来源于 LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>此插件使用的歌词来源于 lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>歌词：%1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>无连接</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>查找主机...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>连接...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>发送请求...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>已连接</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>关闭连接...</translation>
     </message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
index 2be015fea..0772fc458 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
@@ -38,62 +38,55 @@
     </message>
     <message>
         <location filename="../lyricsfactory.cpp" line="52"/>
-        <source>This plugin retrieves lyrics from LyricWiki.org</source>
-        <translation>此插件歌詞來自於 LyricWiki.org</translation>
+        <source>This plugin retrieves lyrics from lyricsplugin.com</source>
+        <translation>此插件歌詞來自於 lyricsplugin.com</translation>
     </message>
 </context>
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="133"/>
+        <location filename="../lyricswindow.cpp" line="113"/>
         <source>Lyrics: %1 - %2</source>
         <translation>歌詞：%1 - %2</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="109"/>
+        <location filename="../lyricswindow.cpp" line="88"/>
         <location filename="../lyricswindow.ui" line="67"/>
         <source>No connection</source>
         <translation>無連接</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="73"/>
+        <location filename="../lyricswindow.cpp" line="75"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="96"/>
-        <location filename="../lyricswindow.cpp" line="99"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="112"/>
+        <location filename="../lyricswindow.cpp" line="91"/>
         <source>Looking up host...</source>
         <translation>找尋主機...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="115"/>
+        <location filename="../lyricswindow.cpp" line="94"/>
         <source>Connecting...</source>
         <translation>連接...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="118"/>
+        <location filename="../lyricswindow.cpp" line="97"/>
         <source>Sending request...</source>
         <translation>發送請求...</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="121"/>
+        <location filename="../lyricswindow.cpp" line="100"/>
         <source>Receiving</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="124"/>
+        <location filename="../lyricswindow.cpp" line="103"/>
         <source>Connected</source>
         <translation>已連接</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="127"/>
+        <location filename="../lyricswindow.cpp" line="106"/>
         <source>Closing connection...</source>
         <translation>關閉連接...</translation>
     </message>