updated .ts files

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

28 files changed, 1738 insertions, 954 deletions

diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts
index 27f8bc650..a322d83de 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts
@@ -22,25 +22,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,56 +55,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
index f9207ff04..9d680aa14 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
@@ -22,25 +22,30 @@
         <translation>Modul pro texty písní</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>O modulu pro texty písní</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Modul Qmmp pro texty písní</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Tento modul získává texty písní z LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Modul pro texty písní</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Umělec:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Název:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Hledat</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Nespojeno</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Umělec:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Hotovo</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Název:</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Nenalezeno</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Příjímám</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Text: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
index a35e79d91..09a2fd33d 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
@@ -22,25 +22,30 @@
         <translation>Liedtext-Modul</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Über Liedtext-Modul</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp Liedtext-Modul</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Dieses Modul empfängt Liedtexte von LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Geschrieben von: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Liedtext-Modul</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Interpret:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Titel:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Suchen</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Interpret:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Keine Verbindung</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Fertig</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Es kann kein Liedtext für dieses Stück gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Daten werden empfangen</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Liedtext: %1 – %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts
index 09682644e..33f46e980 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts
@@ -22,25 +22,30 @@
         <translation>Πρόσθετο στίχων</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Σχετικά με το πρόσθετο στίχων</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp πρόσθετο στίχων</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Αυτό το πρόσθετο κάνει λήψη στίχων από το LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Γράφτηκε από τον: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Πρόσθετο στίχων</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Καλλιτέχνης:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Τίτλος:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Αναζήτηση</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Καλλιτέχνης:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Χωρίς σύνδεση</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Έγινε</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Τίτλος:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Δεν βρέθηκε</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Γίνεται λήψη</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Στίχοι: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts
index 0458730eb..60b186263 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts
@@ -22,25 +22,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,56 +55,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
index 32ef23763..01f90e831 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
@@ -22,25 +22,30 @@
         <translation>Módulo de letras</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Acerca del módulo de letras</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Módulo de letras para Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Este módulo descarga letras de LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Escrito por: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Módulo de letras</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artista:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Buscar</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Sin conexión</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Hecho</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Error</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>No encontrado</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Recibiendo</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Letras: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts
index b7079de43..2fc4f2a35 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts
@@ -22,25 +22,30 @@
         <translation>Sanoitusliitännäinen</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Tietoja - Sanoitusliitännäinen</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp-sanoitusliitännäinen</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Tämä liitännäinen noutaa sanoituksia LyricWikistä</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Toteuttanut: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Sanoitusliitännäinen</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artisti:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Nimike:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Hae</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artisti:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Ei yhteyttä</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Valmis</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Nimike:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Virhe</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Vastaanotetaan</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Sanoitukset: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts
index 66291a197..17bccc79c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts
@@ -22,25 +22,30 @@
         <translation>Greffon de paroles</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>À propos du greffon de paroles</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Greffon de paroles pour Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Ce greffon récupère les paroles depuis LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Écrit par : Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Greffon de paroles</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artiste</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Titre :</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Recherche</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artiste</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Pas de connexion</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Fait</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Titre :</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Non trouvé</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Réception</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Paroles : %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts
index 46382caed..e0bf65fca 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts
@@ -22,25 +22,30 @@
         <translation>Engadido de letras</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Sobre o engadido de letras</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Engadido de letras de Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Este engadido recupera letras dende LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Escrito por: LLya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Engadido de letras</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artista:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Buscar</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Sen conexión</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Feito</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Non atopada</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Recibindo</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Letras: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts
index c7d78b741..424b9c53f 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts
@@ -22,25 +22,30 @@
         <translation>תוסף מילות שיר</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>אודות תוסף מילות שיר</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>תוסף מילות שיר של Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>תוסף zv מאחזר מילות שיר מתוך LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>תוסף מילות שיר</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>אמן:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>כותרת:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>חפש</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>אין חיבור</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>אמן:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>סיום</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>שגיאה</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>כותרת:</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>לא נמצאו</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>קבלה</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>מילות שיר: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts
index 5380055db..8509dc729 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts
@@ -22,25 +22,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,56 +55,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts
index c3cb44b7e..867a2d9ef 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts
@@ -22,25 +22,30 @@
         <translation>Plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Tentang Plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Plugin Lyrics Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Plugin ini menarik lirik dari LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Ditulis oleh: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artist:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Judul:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Telusur</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artist:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Tiada sambungan</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Kelar</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Judul:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Galat</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Tidak ditemukan</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Menerima</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Lirik: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
index ce36dcd64..7e35b0310 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
@@ -22,25 +22,30 @@
         <translation>Estensioni testi</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Informazioni sull&apos;estensione testi</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Estensioni testi per Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Estensione che permette di trovare testi di canzoni da LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Autori: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Estensione testi</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artista:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Titolo:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Cerca</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Nessuna connessione</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Fatto</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Titolo:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Errore</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Non trovato</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Ricezione</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Testo: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
index 5cdffd49a..733d21f23 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
@@ -22,25 +22,30 @@
         <translation>歌詞プラグイン</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>歌詞プラグインについて</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>QMMP 歌詞プラグイン</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>このプラグインは LyricWiki より歌詞を取得します</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>制作: Илья Котов (Ilya Kotov) &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>歌詞プラグイン</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>アーティスト:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>タイトル:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>検索</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>アーティスト:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>接続できません</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>完了</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>タイトル:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>事故</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>見付かりません</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>取得中</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>%1 - %2 の歌詞</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts
index 8e443b377..06b52f8f2 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts
@@ -22,25 +22,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,56 +55,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
index e4ab7c1bb..87f3d9f11 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
@@ -22,22 +22,27 @@
         <translation>Lyrics įskiepis</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Apie Lyrics įskiepį</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp Lyrics įskiepis</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Sukūrė: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Šis įskiepis atsiunčia dainų žodžius iš LyricWiki</translation>
     </message>
@@ -45,62 +50,85 @@
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Atlikta</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Klaida</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Dainos tekstas: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Nėra ryšio</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Nerasta</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Gaunu</translation>
     </message>
     <message>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../lyricswindow.ui" line="14"/>
         <source>Lyrics Plugin</source>
         <translation>Lyrics įskiepis</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
         <source>Artist:</source>
         <translation>Atlikėjas:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="115"/>
         <source>Title:</source>
         <translation>Pavadinimas:</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Ieškoti</translation>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
index db02221fe..a26d10e80 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
@@ -22,25 +22,30 @@
         <translation>Liedtekst Module</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Over de Liedtekst Module</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Liedtekst Module voor Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Deze module haalt liedteksten van LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Auteur: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Liedtekst Module</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artiest:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Naam:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Zoek</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Geen verbinding</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artiest:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Klaar</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Fout</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Naam:</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Niet gevonden</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Bezig met ontvangen</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Liedtekst: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts
index 9e9c77625..07a81868c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts
@@ -22,25 +22,30 @@
         <translation>Wtyczka Teksty piosenek</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>O wtyczce Teksty piosenek</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Wtyczka Teksty piosenek dla Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Ta wtyczka ściąga teksty piosenek z LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Napisana przez: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Wtyczka Teksty piosenek</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artysta:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Tytuł:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Szukaj</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artysta:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Brak połączenia</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Gotowe</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Tytuł:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Nie znaleziono</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Pobieranie</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Teksty: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts
index 87b24a9b9..1488c162c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts
@@ -22,25 +22,30 @@
         <translation>Suplemento Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Sobre o suplemento Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Suplemento Qmmp Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Este suplemento obtém as letras através do sítio web LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Desenvolvido por: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Suplemento Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artista:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Procura</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Sem ligação</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Terminado</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Não encontrado</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Receção</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Letras: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts
index 85bcfe6c9..a6db5cf8d 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts
@@ -22,25 +22,30 @@
         <translation>Plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Sobre o plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Plugin Qmmp Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Este plugin obtém as letras através do LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Plugin Lyrics</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Artista:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Buscar</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Sem conexão</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Feito</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Título:</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Não encontrado</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Recebendo</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Letras: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
index cccf7183a..e86656af7 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
@@ -22,25 +22,30 @@
         <translation>Модуль показа текстов</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>О модуле показа текстов песен</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Модуль показа текстов песен для Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Этот модуль предназначен для получания текстов песен из LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Разработчик: Илья Котов &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Модуль показа текстов</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Исполнитель:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Название:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Поиск</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Нет соединения</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Готово</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Не найдено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Получение</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Текст песни: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts
index bca465aa4..5a62f757d 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts
@@ -22,25 +22,30 @@
         <translation>Plugin textov skladieb</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>O plugine textov skladieb</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp plugin textov skladieb</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Tento plugin sťahuje texty z LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Plugin textov skladieb</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Interprét:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Názov:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Hľadať</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Žiadne pripojenie</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Interprét:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Dokončené</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Názov:</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Nenájdené</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Sťahujem</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Text: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts
index c9e65d76b..50e4f5c0d 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts
@@ -22,25 +22,30 @@
         <translation>Стихови</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>О прикључку за стихове</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Кумп прикључак за стихове</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Добавља стихове са LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Аутор: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Стихови</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Извођач:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Наслов:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Тражи</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Извођач:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Нема везе</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Завршено</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Наслов:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Грешка</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Није нађено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Добављам</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Стихови: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts
index bcac1d8c4..8382fa1c2 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts
@@ -22,25 +22,30 @@
         <translation>Стихови</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>О прикључку за стихове</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Кумп прикључак за стихове</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Добавља стихове са LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Аутор: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Стихови</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>Извођач:</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>Наслов:</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Тражи</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>Извођач:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Нема везе</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Завршено</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>Наслов:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Грешка</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Није нађено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Добављам</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Стихови: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
index 17e49d675..6786ac99b 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
@@ -22,25 +22,30 @@
         <translation>Şarkı Sözü Eklentisi</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Şarkı Sözü Eklentisi Hakkında</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp Şarkı Sözü Eklentisi</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Bu eklenti şarkı sözlerini LyricWiki adresinden alır</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Yazan: Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>Şarkı Sözü Eklentisi</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
         <source>Artist:</source>
         <translation>Artist:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="115"/>
         <source>Title:</source>
         <translation>Başlık:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Ara</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Bağlantı yok</translation>
+        <location filename="../lyricswindow.cpp" line="125"/>
+        <source>Not found</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Hata</translation>
+        <location filename="../lyricswindow.cpp" line="148"/>
+        <source>Receiving</source>
+        <translation>Alınıyor</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
-        <source>Not found</source>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
-        <source>Receiving</source>
-        <translation>Alınıyor</translation>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Şarkı Sözü: %1 - %2</translation>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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 efa355f59..9fb3d7c02 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
@@ -22,22 +22,27 @@
         <translation>Модуль текстів</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>Про модуль текстів</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Модуль текстів для Qmmp</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Розробник: Ілля Котов &lt;forkotov02@ya.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>Цей модуль отримує тексти з LyricWiki</translation>
     </message>
@@ -45,62 +50,85 @@
 <context>
     <name>LyricsWindow</name>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>Готово</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>Помилка</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>Тексти: %1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>Немає з&apos;єднання</translation>
-    </message>
-    <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>Не знайдено</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>Отримання</translation>
     </message>
     <message>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../lyricswindow.ui" line="14"/>
         <source>Lyrics Plugin</source>
         <translation>Модуль текстів</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="146"/>
         <source>Artist:</source>
         <translation>Виконавець:</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="115"/>
         <source>Title:</source>
         <translation>Заголовок:</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>Пошук</translation>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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 6542f3403..142a192ae 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
@@ -22,25 +22,30 @@
         <translation>歌词插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>关于歌词插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp 歌词插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>此插件使用的歌词来源于 LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>歌词插件</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>艺术家：</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>标题：</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>搜索</translation>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>无连接</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>艺术家：</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>完成</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>错误</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>标题：</translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>没有发现</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>歌词：%1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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 3ca04d389..2c1b66871 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
@@ -22,25 +22,30 @@
         <translation>歌詞插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="50"/>
+        <location filename="../lyricsfactory.cpp" line="49"/>
         <source>About Lyrics Plugin</source>
         <translation>關於歌詞插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="51"/>
+        <location filename="../lyricsfactory.cpp" line="50"/>
         <source>Qmmp Lyrics Plugin</source>
         <translation>Qmmp 歌詞插件</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="52"/>
+        <location filename="../lyricsfactory.cpp" line="51"/>
         <source>This plugin retrieves lyrics from LyricWiki</source>
         <translation>此插件歌詞來自於 LyricWiki</translation>
     </message>
     <message>
-        <location filename="../lyricsfactory.cpp" line="53"/>
+        <location filename="../lyricsfactory.cpp" line="52"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>撰寫：Ilya Kotov &lt;forkotov02@ya.ru&gt;</translation>
     </message>
+    <message>
+        <location filename="../lyricsfactory.cpp" line="53"/>
+        <source>Based on Ultimate Lyrics script by Vladimir Brkic &lt;vladimir_brkic@yahoo.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LyricsWindow</name>
@@ -50,57 +55,80 @@
         <translation>歌詞插件</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="45"/>
-        <source>Artist:</source>
-        <translation>藝術家：</translation>
+        <location filename="../lyricswindow.ui" line="31"/>
+        <source>Provider:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="55"/>
-        <source>Title:</source>
-        <translation>標題：</translation>
+        <location filename="../lyricswindow.ui" line="122"/>
+        <source>Album:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.ui" line="139"/>
+        <source>Track:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="65"/>
-        <source>Search</source>
-        <translation>搜索</translation>
+        <location filename="../lyricswindow.ui" line="146"/>
+        <source>Artist:</source>
+        <translation>藝術家：</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.ui" line="36"/>
-        <source>No connection</source>
-        <translation>無連接</translation>
+        <location filename="../lyricswindow.ui" line="161"/>
+        <source>Year:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="78"/>
-        <location filename="../lyricswindow.cpp" line="209"/>
-        <source>Done</source>
-        <translation>完成</translation>
+        <location filename="../lyricswindow.ui" line="115"/>
+        <source>Title:</source>
+        <translation>標題：</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="81"/>
-        <location filename="../lyricswindow.cpp" line="105"/>
-        <location filename="../lyricswindow.cpp" line="111"/>
-        <location filename="../lyricswindow.cpp" line="119"/>
-        <location filename="../lyricswindow.cpp" line="127"/>
-        <location filename="../lyricswindow.cpp" line="138"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
+        <location filename="../lyricswindow.cpp" line="114"/>
+        <source>&lt;h2&gt;%1 - %2&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="132"/>
-        <location filename="../lyricswindow.cpp" line="165"/>
+        <location filename="../lyricswindow.cpp" line="125"/>
         <source>Not found</source>
         <translation>沒有發現</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="152"/>
-        <location filename="../lyricswindow.cpp" line="178"/>
+        <location filename="../lyricswindow.cpp" line="135"/>
+        <source>Error: %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../lyricswindow.cpp" line="148"/>
         <source>Receiving</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../lyricswindow.cpp" line="179"/>
-        <source>Lyrics: %1 - %2</source>
-        <translation>歌詞：%1 - %2</translation>
+        <location filename="../lyricswindow.cpp" line="203"/>
+        <source>cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Lyrics Plugin Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Lyrics providers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UltimateLyricsParser</name>
+    <message>
+        <location filename="../ultimatelyricsparser.cpp" line="116"/>
+        <source>%1 (line: %2)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>