From 729e8e729d5de12c324854192b05b00a40cdcb1a Mon Sep 17 00:00:00 2001
From: Arnaud Bienner
Date: Thu, 20 Jan 2011 23:42:28 +0000
Subject: [PATCH] Adding track selection dialog for tag fetcher results. Also
corrected tagfetcher to prevent from infinite loop when no result is found
---
src/CMakeLists.txt | 3 +
src/core/tagfetcher.cpp | 42 +++++---
src/core/tagfetcher.h | 1 +
src/translations/ar.po | 30 ++++--
src/translations/be.po | 31 ++++--
src/translations/bg.po | 66 ++++++------
src/translations/br.po | 28 +++--
src/translations/ca.po | 45 ++++----
src/translations/cs.po | 147 +++++++++++++-------------
src/translations/cy.po | 28 +++--
src/translations/da.po | 14 ++-
src/translations/de.po | 60 +++++------
src/translations/el.po | 99 ++++++++----------
src/translations/en.po | 28 +++--
src/translations/en_CA.po | 37 ++++---
src/translations/en_GB.po | 36 ++++---
src/translations/eo.po | 28 +++--
src/translations/es.po | 167 ++++++++++++++----------------
src/translations/et.po | 32 +++---
src/translations/eu.po | 28 +++--
src/translations/fi.po | 30 ++++--
src/translations/fr.po | 158 +++++++++++++---------------
src/translations/gl.po | 35 ++++---
src/translations/he.po | 50 +++++----
src/translations/hi.po | 28 +++--
src/translations/hr.po | 47 +++++----
src/translations/hu.po | 64 ++++++------
src/translations/it.po | 91 ++++++++--------
src/translations/ja.po | 14 ++-
src/translations/kk.po | 33 +++---
src/translations/lt.po | 52 ++++++----
src/translations/lv.po | 60 +++++++++--
src/translations/nb.po | 49 +++++----
src/translations/nl.po | 65 ++++++------
src/translations/oc.po | 29 ++++--
src/translations/pl.po | 130 +++++++++++------------
src/translations/pt.po | 85 +++++++--------
src/translations/pt_BR.po | 49 +++++----
src/translations/ro.po | 31 +++---
src/translations/ru.po | 137 +++++++++++-------------
src/translations/sk.po | 148 ++++++++++++--------------
src/translations/sl.po | 82 +++++++--------
src/translations/sr.po | 36 ++++---
src/translations/sv.po | 75 ++++++--------
src/translations/tr.po | 56 +++++-----
src/translations/translations.pot | 14 ++-
src/translations/uk.po | 86 +++++++--------
src/translations/zh_CN.po | 40 ++++---
src/translations/zh_TW.po | 37 ++++---
src/ui/edittagdialog.cpp | 69 ++++++++++--
src/ui/edittagdialog.h | 4 +
src/ui/trackselectiondialog.cpp | 83 +++++++++++++++
src/ui/trackselectiondialog.h | 52 ++++++++++
src/ui/trackselectiondialog.ui | 158 ++++++++++++++++++++++++++++
54 files changed, 1810 insertions(+), 1317 deletions(-)
create mode 100644 src/ui/trackselectiondialog.cpp
create mode 100644 src/ui/trackselectiondialog.h
create mode 100644 src/ui/trackselectiondialog.ui
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be605976f..a8c6087fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -208,6 +208,7 @@ set(SOURCES
ui/screensaver.cpp
ui/settingsdialog.cpp
ui/systemtrayicon.cpp
+ ui/trackselectiondialog.cpp
ui/windows7thumbbar.cpp
widgets/autoexpandingtreeview.cpp
@@ -382,6 +383,7 @@ set(HEADERS
ui/qtsystemtrayicon.h
ui/settingsdialog.h
ui/systemtrayicon.h
+ ui/trackselectiondialog.h
ui/windows7thumbbar.h
widgets/autoexpandingtreeview.h
@@ -454,6 +456,7 @@ set(UI
ui/organisedialog.ui
ui/organiseerrordialog.ui
ui/settingsdialog.ui
+ ui/trackselectiondialog.ui
ui/wiimotedevshortcutsconfig.ui
ui/wiimotedevshortcutgrabber.ui
diff --git a/src/core/tagfetcher.cpp b/src/core/tagfetcher.cpp
index ba4c24119..fd7905375 100644
--- a/src/core/tagfetcher.cpp
+++ b/src/core/tagfetcher.cpp
@@ -109,21 +109,28 @@ TagFetcherItem::TagFetcherItem(const QString& _filename, int _fileId, tunepimp_t
: filename_(_filename),
fileId_(_fileId),
pimp_(_pimp),
- network_(_network)
+ network_(_network),
+ already_tried_to_recognize(false)
{ }
void TagFetcherItem::Unrecognized() {
- char trm[255];
- trm[0] = 0;
- track_t track = tp_GetTrack(pimp_, fileId_);
- tr_Lock(track);
- tr_GetPUID(track, trm, 255);
- if ( !trm[0] ) {
- tr_SetStatus(track, ePending);
- tp_Wake(pimp_, track);
+ if(already_tried_to_recognize) {
+ // We already tried to recognize this music and, apparently, nothing has been found: stopping here
+ emit FetchFinishedSignal(fileId_);
+ } else {
+ already_tried_to_recognize = true;
+ char trm[255];
+ trm[0] = 0;
+ track_t track = tp_GetTrack(pimp_, fileId_);
+ tr_Lock(track);
+ tr_GetPUID(track, trm, 255);
+ if ( !trm[0] ) {
+ tr_SetStatus(track, ePending);
+ tp_Wake(pimp_, track);
+ }
+ tr_Unlock(track);
+ tp_ReleaseTrack(pimp_, track);
}
- tr_Unlock(track);
- tp_ReleaseTrack(pimp_, track);
}
void TagFetcherItem::PuidGenerated() {
@@ -177,16 +184,27 @@ SongList TagFetcherItem::ReadTrack(QXmlStreamReader *reader) {
currentArtist = reader->readElementText();
}
} else if(reader->name() == "release-list") {
+ reader->readNext();
while(!reader->atEnd()) {
- reader->readNext();
if(reader->name() == "title") { // album (release) title
QString albumTitle = reader->readElementText();
Song newSongMatch;
newSongMatch.Init(currentTitle, currentArtist, albumTitle, 0); // Using 0 as length. We could have used field but it is not usefull, so don't wasting our time and keeping 0
+ reader->readNext();
+ if(reader->name() == "track-list") {
+ QXmlStreamAttributes attributes = reader->attributes();
+ if(attributes.hasAttribute("offset")) {
+ int track = attributes.value("offset").toString().toInt()+1;
+ newSongMatch.set_track(track);
+ }
+ reader->readNext();
+ }
songs << newSongMatch;
} else if(reader->tokenType() == QXmlStreamReader::EndElement &&
reader->name() == "release-list") {
break;
+ } else {
+ reader->readNext();
}
}
}
diff --git a/src/core/tagfetcher.h b/src/core/tagfetcher.h
index c64b69553..7fab53b04 100644
--- a/src/core/tagfetcher.h
+++ b/src/core/tagfetcher.h
@@ -93,6 +93,7 @@ class TagFetcherItem : public QObject {
NetworkAccessManager *network_;
char puid_[255];
SongList songs_fetched_;
+ bool already_tried_to_recognize; // to prevent infinite loops while always trying to recognize a file
#endif // HAVE_LIBTUNEPIMP
};
diff --git a/src/translations/ar.po b/src/translations/ar.po
index 629245fc8..8b4e083db 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -162,8 +162,7 @@ msgid ""
"selecting songs."
msgstr ""
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
+msgid "A song will be included in the playlist if it matches these conditions."
msgstr ""
msgid "A-Z"
@@ -513,6 +512,9 @@ msgstr ""
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "اضغط هنا لإضافة بعض الموسيقى"
@@ -534,7 +536,7 @@ msgstr ""
msgid "Comment"
msgstr ""
-msgid "Complete automatically"
+msgid "Complete tags automatically"
msgstr ""
msgid "Composer"
@@ -1900,6 +1902,9 @@ msgstr ""
msgid "Restrict to ASCII characters"
msgstr ""
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr ""
@@ -1990,6 +1995,9 @@ msgstr ""
msgid "Select None"
msgstr ""
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr ""
@@ -2134,6 +2142,9 @@ msgstr ""
msgid "Sonogram"
msgstr ""
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr ""
@@ -2515,15 +2526,14 @@ msgid "You can listen to background streams at the same time as other music."
msgstr ""
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
msgid "You love this track"
@@ -2636,7 +2646,6 @@ msgstr ""
msgid "track %1"
msgstr ""
-#, qt-format
#~ msgid "Unknown audio engine \"%1\". Choices are:"
#~ msgstr "محرك الصوت \"%1\" غير معروف. الخيارات هي:"
@@ -2646,7 +2655,6 @@ msgstr ""
#~ msgid "Options"
#~ msgstr "خيارات"
-#, qt-format
#~ msgid "Hide %1"
#~ msgstr "أخفِ %1"
diff --git a/src/translations/be.po b/src/translations/be.po
index 9be5ff8cc..ed9c1f815 100644
--- a/src/translations/be.po
+++ b/src/translations/be.po
@@ -165,10 +165,8 @@ msgstr ""
"Існуюць розныя тыпы разумных плэйлістоў, якія прапануюць розныя спосабы "
"выбару кампазіцый"
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
-msgstr ""
-"Кампазіцыя будзе дададзеная ў плэй-ліст, калі адпавядае гэтым умовам."
+msgid "A song will be included in the playlist if it matches these conditions."
+msgstr "Кампазіцыя будзе дададзеная ў плэй-ліст, калі адпавядае гэтым умовам."
msgid "A-Z"
msgstr "A-Z"
@@ -522,6 +520,9 @@ msgstr "Прагляд малюнкаў у Clementine"
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "Пстрыкніце тут, каб дадаць музыку"
@@ -543,7 +544,7 @@ msgstr "Колер"
msgid "Comment"
msgstr "Каментар"
-msgid "Complete automatically"
+msgid "Complete tags automatically"
msgstr ""
msgid "Composer"
@@ -1915,6 +1916,9 @@ msgstr ""
msgid "Restrict to ASCII characters"
msgstr ""
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr ""
@@ -2005,6 +2009,9 @@ msgstr ""
msgid "Select None"
msgstr ""
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr ""
@@ -2149,6 +2156,9 @@ msgstr ""
msgid "Sonogram"
msgstr ""
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr ""
@@ -2530,15 +2540,14 @@ msgid "You can listen to background streams at the same time as other music."
msgstr ""
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
msgid "You love this track"
diff --git a/src/translations/bg.po b/src/translations/bg.po
index ab6b8778f..246b3d92a 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -169,8 +169,7 @@ msgstr ""
"различни типове умен плейлист,които предлагат различни начини за избиране на "
"песни."
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
+msgid "A song will be included in the playlist if it matches these conditions."
msgstr "Песен ще бъде включена в плейлиста ако отговаря на тези критерии."
msgid "A-Z"
@@ -317,12 +316,10 @@ msgid "Always show the main window"
msgstr "Винаги показване на основния прозорец"
msgid "An error occurred copying the iTunes database from the device"
-msgstr ""
-"Получи се грешка при копирането на iTunes базата данни от утройството"
+msgstr "Получи се грешка при копирането на iTunes базата данни от утройството"
msgid "An error occurred copying the iTunes database onto the device"
-msgstr ""
-"Получи се грешка при копирането на iTunes базата данни на утройството"
+msgstr "Получи се грешка при копирането на iTunes базата данни на утройството"
msgid "An error occurred loading the iTunes database"
msgstr "Възникна грешка при зареждането на базата данни на iTunes"
@@ -528,6 +525,9 @@ msgstr "Клементин мениджър на изображения"
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "Натиснете тук за да добавите музика"
@@ -549,7 +549,7 @@ msgstr "Цвят"
msgid "Comment"
msgstr "Коментар"
-msgid "Complete automatically"
+msgid "Complete tags automatically"
msgstr ""
msgid "Composer"
@@ -578,8 +578,7 @@ msgid "Convert all music"
msgstr "Конвертирай цялата музика"
msgid "Convert any music that the device can't play"
-msgstr ""
-"Конвертирай само музиката, която това устройство не може да изпълнява"
+msgstr "Конвертирай само музиката, която това устройство не може да изпълнява"
msgid "Copy to device..."
msgstr "Копирай в устройство"
@@ -903,8 +902,8 @@ msgstr "Въведете ново име за тази плейлиста"
msgid ""
"Enter an artist or tag to start listening to Last.fm radio."
msgstr ""
-"Въведете изпълнител или етикет за да започнете да слушате "
-"Last.fm радио"
+"Въведете изпълнител или етикет за да започнете да слушате Last."
+"fm радио"
msgid "Enter search terms here"
msgstr "Въведете критерий за търсене"
@@ -1167,8 +1166,8 @@ msgstr "Игнориране на \"The\" в имена на изпълните
msgid ""
"Images (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm *.tiff)"
msgstr ""
-"Изображения (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm "
-"*.tiff)"
+"Изображения (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm *."
+"tiff)"
msgid ""
"In dynamic mode new tracks will be chosen and added to the playlist every "
@@ -1484,8 +1483,7 @@ msgid "Music"
msgstr "Музика"
msgid "Music (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
-msgstr ""
-"Музика (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
+msgstr "Музика (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
msgid "Music Library"
msgstr "Музикална Библиотека"
@@ -1771,8 +1769,7 @@ msgid "Preferences..."
msgstr "Настройки..."
msgid "Preferred album art filenames (comma separated)"
-msgstr ""
-"Предпочитани файлови разширения за обложките, разделени със запетайки."
+msgstr "Предпочитани файлови разширения за обложките, разделени със запетайки."
msgid "Preferred audio format"
msgstr "Предпочитан аудио формат"
@@ -1943,6 +1940,9 @@ msgstr "Нулирай пътите пускане"
msgid "Restrict to ASCII characters"
msgstr "Само ASCII символи"
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr "Рок"
@@ -2033,6 +2033,9 @@ msgstr "Избиране на всички"
msgid "Select None"
msgstr "Изчистване на избора"
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr "Избери визуализации"
@@ -2177,6 +2180,9 @@ msgstr "Информация за песен"
msgid "Sonogram"
msgstr "Сонограма"
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr "Сортиране по жанр(азбучно)"
@@ -2581,21 +2587,19 @@ msgstr ""
"Можете да слушате фонови потоци по същото време, когато слушате и музика."
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
-"Можете да слушате песни безплатно, но само хора с платени акаунти могат да слушат Last.fm радио от "
-"Клементин."
+"Можете да слушате песни безплатно, но само хора с платени акаунти могат да слушат Last.fm радио от Клементин."
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
-"Можете да изпозвате Wii Remote като дистанционно за Клементин.Вижте Wiki страницата на "
+"Можете да изпозвате Wii Remote като дистанционно за Клементин.Вижте Wiki страницата на "
"Клементин за повече информация.\n"
msgid "You love this track"
@@ -2711,25 +2715,21 @@ msgstr "Стоп"
msgid "track %1"
msgstr "песен %1"
-#, qt-format
#~ msgid "Couldn't load the last.fm radio station: %1"
#~ msgstr "Не може да бъде заредена last.fm радио станция: %1"
#~ msgid "Delete files..."
#~ msgstr "Изтриване на файлове..."
-#, c-format
#~ msgid "Editing %n tracks"
#~ msgstr "Редактиране на %n песни"
#~ msgid "Hide..."
#~ msgstr "Скриване..."
-#, qt-format
#~ msgid "Last.fm Loved Tracks - %1"
#~ msgstr "Last.fm Любими Песни - %1"
-#, qt-format
#~ msgid "Last.fm Recommended Radio - %1"
#~ msgstr "Last.fm Препоръчано Радио - %1"
@@ -2739,7 +2739,6 @@ msgstr "песен %1"
#~ msgid "My Loved Tracks"
#~ msgstr "Моите Любими Песни"
-#, qt-format
#~ msgid "Hide %1"
#~ msgstr "Скриване на %1"
@@ -2758,6 +2757,5 @@ msgstr "песен %1"
#~ msgid "Stretch columns to fit window"
#~ msgstr "Разшири колоните да паснат на прозореца"
-#, qt-format
#~ msgid "Unknown audio engine \"%1\". Choices are:"
#~ msgstr "Неизвестен аудио двигател \"%1\" Изборите са:"
diff --git a/src/translations/br.po b/src/translations/br.po
index 73986793f..f13eec125 100644
--- a/src/translations/br.po
+++ b/src/translations/br.po
@@ -162,8 +162,7 @@ msgid ""
"selecting songs."
msgstr ""
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
+msgid "A song will be included in the playlist if it matches these conditions."
msgstr ""
msgid "A-Z"
@@ -514,6 +513,9 @@ msgstr "Gweler skeudennoù Clementine"
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "Klikit aze evit krouiñ ho levraoueg sonerezh"
@@ -535,7 +537,7 @@ msgstr "Livioù"
msgid "Comment"
msgstr "Meneg"
-msgid "Complete automatically"
+msgid "Complete tags automatically"
msgstr ""
msgid "Composer"
@@ -1902,6 +1904,9 @@ msgstr ""
msgid "Restrict to ASCII characters"
msgstr ""
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr ""
@@ -1992,6 +1997,9 @@ msgstr ""
msgid "Select None"
msgstr ""
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr ""
@@ -2136,6 +2144,9 @@ msgstr ""
msgid "Sonogram"
msgstr ""
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr ""
@@ -2517,15 +2528,14 @@ msgid "You can listen to background streams at the same time as other music."
msgstr ""
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
msgid "You love this track"
diff --git a/src/translations/ca.po b/src/translations/ca.po
index efea39dc8..8a842b919 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -155,8 +155,8 @@ msgid ""
"If you surround sections of text that contain a token with curly-braces, "
"that section will be hidden if the token is empty.
"
msgstr ""
-"Les fitxes de reemplaçament comencen amb %, per exemple: %artist %album "
-"%title
\n"
+"Les fitxes de reemplaçament comencen amb %, per exemple: %artist %album %"
+"title
\n"
"\n"
"Si demarqueu entre claus una secció de text que contingui una fitxa de "
"remplaçament, aquesta secció no es mostrarà si la fitxa de remplaçament es "
@@ -172,8 +172,7 @@ msgstr ""
"reproducció intel·ligent que ofereixen diferents formes de seleccionar "
"cançons."
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
+msgid "A song will be included in the playlist if it matches these conditions."
msgstr ""
msgid "A-Z"
@@ -533,6 +532,9 @@ msgstr "Visor d'imatges Clementine"
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "Fes click aquí per afegir música"
@@ -555,7 +557,7 @@ msgstr "Color"
msgid "Comment"
msgstr "Comentari"
-msgid "Complete automatically"
+msgid "Complete tags automatically"
msgstr ""
msgid "Composer"
@@ -1333,8 +1335,8 @@ msgstr ""
msgid "Leave blank for the default. Examples: \"/dev/dsp\", \"front\", etc."
msgstr ""
-"Deixar-ho en blanc per assignar el valor per defecte. Exemples : "
-"\"/dev/dsp\", \"front\", etc."
+"Deixar-ho en blanc per assignar el valor per defecte. Exemples : \"/dev/dsp"
+"\", \"front\", etc."
msgid "Length"
msgstr "Durada"
@@ -1482,8 +1484,7 @@ msgid "Music"
msgstr "Música"
msgid "Music (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
-msgstr ""
-"Música (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
+msgstr "Música (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma *.mp4 *.spx *.wav)"
msgid "Music Library"
msgstr "Biblioteca de Música"
@@ -1939,6 +1940,9 @@ msgstr ""
msgid "Restrict to ASCII characters"
msgstr "Limitar als caràcters ASCII"
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr "Rock"
@@ -2029,6 +2033,9 @@ msgstr "Seleccionar-ho tot"
msgid "Select None"
msgstr "No selecciones res"
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr "Seleccioneu visualitzacions"
@@ -2173,6 +2180,9 @@ msgstr ""
msgid "Sonogram"
msgstr ""
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr ""
@@ -2567,15 +2577,14 @@ msgid "You can listen to background streams at the same time as other music."
msgstr ""
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
msgid "You love this track"
@@ -2694,29 +2703,24 @@ msgstr "peça %1"
#~ msgid "ASF"
#~ msgstr "ASF"
-#, qt-format
#~ msgid "Couldn't load the last.fm radio station: %1"
#~ msgstr "No es va poder carregar l'estació de ràdio de last.fm: %1"
#~ msgid "Delete files..."
#~ msgstr "Esborra els fitxers..."
-#, c-format
#~ msgid "Editing %n tracks"
#~ msgstr "Editant %n pistes"
-#, qt-format
#~ msgid "Hide %1"
#~ msgstr "Amaga %1"
#~ msgid "Hide..."
#~ msgstr "Amaga..."
-#, qt-format
#~ msgid "Last.fm Recommended Radio - %1"
#~ msgstr "Radio recomanada de Last.fm - %1"
-#, qt-format
#~ msgid "Last.fm Loved Tracks - %1"
#~ msgstr "Cançons favorites a Last.fm - %1"
@@ -2738,7 +2742,6 @@ msgstr "peça %1"
#~ msgid "Select engine"
#~ msgstr "Seleccionar motor"
-#, qt-format
#~ msgid "Unknown audio engine \"%1\". Choices are:"
#~ msgstr "Motor d'àudio \"%1\" desconegut. Les opcions són:"
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 93b653610..152b4bc7b 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -171,8 +171,7 @@ msgstr ""
"knihovny. Jsou tůzné druhy chytrých seznamů skladeb, jež nabízejí rozdílné "
"způsoby výběru písniček."
-msgid ""
-"A song will be included in the playlist if it matches these conditions."
+msgid "A song will be included in the playlist if it matches these conditions."
msgstr ""
"Písnička bude zařazena do seznamu skladeb, pokud bude odpovídat těmto "
"podmínkám."
@@ -530,6 +529,9 @@ msgstr "Prohlížeč obrázků pro Clementine"
msgid "Clementine scripts"
msgstr ""
+msgid "Clementine was unable to find results for this file"
+msgstr ""
+
msgid "Click here to add some music"
msgstr "Zde klepněte pro přidání nějaké hudby"
@@ -551,8 +553,8 @@ msgstr "Barva"
msgid "Comment"
msgstr "Poznámka"
-msgid "Complete automatically"
-msgstr "Dokončit automaticky"
+msgid "Complete tags automatically"
+msgstr ""
msgid "Composer"
msgstr "Skladatel"
@@ -903,8 +905,8 @@ msgstr "Zadejte název pro tento seznam skladeb"
msgid ""
"Enter an artist or tag to start listening to Last.fm radio."
msgstr ""
-"Zadejte umělce nebo značku pro spuštění poslouchání rádia "
-"Last.fm."
+"Zadejte umělce nebo značku pro spuštění poslouchání rádia Last."
+"fm."
msgid "Enter search terms here"
msgstr "Zde zadejte hledané výrazy"
@@ -1335,8 +1337,8 @@ msgstr "Nejméně oblíbené skladby"
msgid "Leave blank for the default. Examples: \"/dev/dsp\", \"front\", etc."
msgstr ""
-"Ponechat prázdné kvůli výchozímu nastavení. Příklady: \"/dev/dsp\", "
-"\"front\", atd."
+"Ponechat prázdné kvůli výchozímu nastavení. Příklady: \"/dev/dsp\", \"front"
+"\", atd."
msgid "Length"
msgstr "Délka"
@@ -1940,6 +1942,9 @@ msgstr "Nastavit počty přehrání znovu"
msgid "Restrict to ASCII characters"
msgstr "Omezit na znaky &ASCII"
+msgid "Results fetched"
+msgstr ""
+
msgid "Rock"
msgstr "Rocková hudba"
@@ -2030,6 +2035,9 @@ msgstr "Vybrat vše"
msgid "Select None"
msgstr "Nevybrat žádnou skladbu"
+msgid "Select best possible match"
+msgstr ""
+
msgid "Select visualizations"
msgstr "Vybrat znázornění hudby"
@@ -2174,6 +2182,9 @@ msgstr "Info o skladbě"
msgid "Sonogram"
msgstr "Sonogram"
+msgid "Sorry"
+msgstr ""
+
msgid "Sort by genre (alphabetically)"
msgstr "Třídit podle žánru (abecedně)"
@@ -2436,8 +2447,7 @@ msgid "Use Gnome's shortcut keys"
msgstr "Používat klávesové zkratky GNOME"
msgid "Use Replay Gain metadata if it is available"
-msgstr ""
-"Používat metadata pro zesílení přehrávaných skladeb, jsou-li dostupná"
+msgstr "Používat metadata pro zesílení přehrávaných skladeb, jsou-li dostupná"
msgid "Use Wii Remote"
msgstr "Použít dálkové ovládání Wii"
@@ -2562,8 +2572,7 @@ msgid "You are about to download the following albums"
msgstr "Chystáte se stáhnout následující alba"
msgid "You can change the way the songs in the library are organised."
-msgstr ""
-"Můžete změnit způsob, jak jsou skladby v hudebních knihovnách tříděny."
+msgstr "Můžete změnit způsob, jak jsou skladby v hudebních knihovnách tříděny."
msgid ""
"You can listen to Magnatune songs for free without an account. Purchasing a "
@@ -2576,18 +2585,17 @@ msgid "You can listen to background streams at the same time as other music."
msgstr "Proudy na pozadí můžete poslouchat ve stejnou dobu jako jinou hudbu."
msgid ""
-"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from "
-"Clementine."
+"You can scrobble tracks for free, but only paid subscribers can stream Last.fm radio from Clementine."
msgstr ""
"Můžete skladby bezplatně \"scrobblovat\", ale pouze platící odběratelé mohou s Clementine poslouchat rádio "
"Last.fm."
msgid ""
-"You can use your Wii Remote as a remote control for Clementine. See the page on the "
-"Clementine wiki for more information.\n"
+"You can use your Wii Remote as a remote control for Clementine. See the page on the Clementine "
+"wiki for more information.\n"
msgstr ""
"Své dálkové ovládání pro Wii můžete použít jako dálkové ovládání pro "
"Clementine. Podívejte "
@@ -2601,9 +2609,9 @@ msgid ""
"style:italic;\">Enable access for assistive devices\" to use global "
"shortcuts in Clementine."
msgstr ""
-"Potřebujete spustit nastavení systému a zapnout \"Povolit přístup pro podpůrná zařízení\", abyste mohl "
-"v Clementine používat všeobecné zkratky."
+"Potřebujete spustit nastavení systému a zapnout \"Povolit přístup pro podpůrná zařízení\", abyste mohl v "
+"Clementine používat všeobecné zkratky."
msgid "You will need to restart Clementine if you change the language."
msgstr "Pokud změníte jazyk, budete muset Clementine spustit znovu."
@@ -2706,6 +2714,9 @@ msgstr "Zastavit"
msgid "track %1"
msgstr "Skladba %1"
+#~ msgid "Complete automatically"
+#~ msgstr "Dokončit automaticky"
+
#~ msgid "&Show tray icon"
#~ msgstr "Zobrazit ikonu v &systémovém panelu"
@@ -2718,7 +2729,6 @@ msgstr "Skladba %1"
#~ msgid "Show section"
#~ msgstr "Zobrazit skeci"
-#, qt-format
#~ msgid "Hide %1"
#~ msgstr "Skrýt %1"
@@ -2728,35 +2738,27 @@ msgstr "Skladba %1"
#~ msgid "Neighbours"
#~ msgstr "Sousedi"
-#, qt-format
#~ msgid "%1's Radio Station"
#~ msgstr "Rádiová stanice uživatele %1"
-#, qt-format
#~ msgid "%1's Loved Tracks"
#~ msgstr "Oblíbené skladby uživatele %1"
-#, qt-format
#~ msgid "%1's Neighborhood"
#~ msgstr "Sousedství uživatele %1"
-#, qt-format
#~ msgid "%1's Recommended Radio"
#~ msgstr "Doporučené rádio uživatele %1"
-#, qt-format
#~ msgid "%1's Neighbour Radio"
#~ msgstr "Sousedovo rádio uživatele %1"
-#, qt-format
#~ msgid "%1's Library"
#~ msgstr "Knihovna uživatele %1"
-#, qt-format
#~ msgid "Similar Artists to %1"
#~ msgstr "Umělci podobní %1"
-#, qt-format
#~ msgid "Tag Radio: %1"
#~ msgstr "Rádio značky: %1"
@@ -2813,21 +2815,21 @@ msgstr "Skladba %1"
#~ msgstr "Verze"
#~ msgid ""
-#~ "\n"
-#~ "\n"
+#~ "\n"
#~ "http://code.google.com/p/clementine-"
-#~ "player/
\n"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">http://code.google.com/p/clementine-player/"
+#~ "span>
\n"
#~ "\n"
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
+#~ "\">
\n"
#~ "Authors:
\n"
@@ -2836,8 +2838,8 @@ msgstr "Skladba %1"
#~ "href=\"mailto:me@davidsansome.com\">me@davidsansome.com>\n"
#~ "\n"
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
+#~ "\">\n"
#~ "Thanks to:
\n"
@@ -2846,28 +2848,28 @@ msgstr "Skladba %1"
#~ "href=\"mailto:markey@web.de\">markey@web.de>\n"
#~ "Max Howell <Max Howell <max.howell@methylblue.com>
\n"
#~ "... and all the Amarok "
#~ "contributors
"
#~ msgstr ""
-#~ "\n"
-#~ "\n"
+#~ "\n"
#~ "http://code.google.com/p/clementine-"
-#~ "player/
\n"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">http://code.google.com/p/clementine-player/"
+#~ "span>\n"
#~ "\n"
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
+#~ "\">\n"
#~ "Autoři:
\n"
@@ -2876,8 +2878,8 @@ msgstr "Skladba %1"
#~ "href=\"mailto:me@davidsansome.com\">me@davidsansome.com>\n"
#~ "\n"
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
+#~ "\">\n"
#~ "Poděkování:
\n"
@@ -2886,12 +2888,12 @@ msgstr "Skladba %1"
#~ "href=\"mailto:markey@web.de\">markey@web.de>\n"
#~ "Max Howell <Max Howell <max.howell@methylblue.com>
\n"
#~ "... a všem přispěvatelům "
-#~ "Amaroku
"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">... a všem "
+#~ "přispěvatelům Amaroku