Load playlist in separate threads on startup.

src/CMakeLists.txt

@@ -78,6 +78,7 @@ set(SOURCES
   library/libraryquery.cpp
   library/libraryview.cpp
   library/librarywatcher.cpp
+  library/sqlrow.cpp
 
   playlist/playlist.cpp
   playlist/playlistbackend.cpp

src/core/song.cpp

@@ -57,6 +57,7 @@ using boost::scoped_ptr;
 
 #include "albumcoverloader.h"
 #include "engines/enginebase.h"
+#include "library/sqlrow.h"
 #include "widgets/trackslider.h"
 
 static QStringList Prepend(const QString& text, const QStringList& list) {
@@ -280,7 +281,6 @@ QString UniversalEncodingHandler::FixEncoding(const TagLib::String& input) {
   return TStringToQString(input).trimmed();
 }
 
-
 Song::Private::Private()
   : valid_(false),
     id_(-1),
@@ -495,13 +495,11 @@ void Song::GuessFileType(TagLib::FileRef* fileref) {
     d->filetype_ = Type_TrueAudio;
 }
 
-void Song::InitFromQuery(const QSqlQuery& q, int col) {
+void Song::InitFromQuery(const SqlRow& q, int col) {
 #ifndef QT_NO_DEBUG_OUTPUT
   if (qApp->thread() == QThread::currentThread())
     qWarning() << Q_FUNC_INFO << "on GUI thread!";
 #endif
-  if (!q.isValid())
-    return;
 
   d->valid_ = true;
 

src/core/song.h

@@ -37,6 +37,8 @@
 #  include <gpod/itdb.h>
 #endif
 
+class SqlRow;
+
 namespace lastfm {
   class Track;
 }
@@ -83,6 +85,7 @@ class UniversalEncodingHandler : public TagLib::ID3v1::StringHandler,
   QTextCodec* current_codec_;
 };
 
+
 class Song {
  public:
   Song();
@@ -124,7 +127,7 @@ class Song {
   // Constructors
   void Init(const QString& title, const QString& artist, const QString& album, int length);
   void InitFromFile(const QString& filename, int directory_id);
-  void InitFromQuery(const QSqlQuery& query, int col = 0);
+  void InitFromQuery(const SqlRow& query, int col = 0);
   void InitFromLastFM(const lastfm::Track& track);
 
   void MergeFromSimpleMetaBundle(const Engine::SimpleMetaBundle& bundle);

src/library/librarybackend.cpp

@@ -16,6 +16,7 @@
 
 #include "librarybackend.h"
 #include "libraryquery.h"
+#include "sqlrow.h"
 #include "core/database.h"
 #include "core/scopedtransaction.h"
 

src/library/librarymodel.cpp

@@ -18,6 +18,7 @@
 #include "librarybackend.h"
 #include "libraryitem.h"
 #include "librarydirectorymodel.h"
+#include "sqlrow.h"
 #include "core/database.h"
 #include "playlist/songmimedata.h"
 #include "ui/iconloader.h"

src/library/libraryplaylistitem.cpp

@@ -39,7 +39,7 @@ void LibraryPlaylistItem::Reload() {
   song_.InitFromFile(song_.filename(), song_.directory_id());
 }
 
-bool LibraryPlaylistItem::InitFromQuery(const QSqlQuery &query) {
+bool LibraryPlaylistItem::InitFromQuery(const SqlRow& query) {
   // Rows from the songs tables come first
   song_.InitFromQuery(query);
 

src/library/libraryplaylistitem.h

@@ -25,7 +25,7 @@ class LibraryPlaylistItem : public PlaylistItem {
   LibraryPlaylistItem(const QString& type);
   LibraryPlaylistItem(const Song& song);
 
-  bool InitFromQuery(const QSqlQuery &query);
+  bool InitFromQuery(const SqlRow& query);
   void Reload();
 
   Song Metadata() const;

src/library/sqlrow.cpp

@@ -0,0 +1,12 @@
+#include "sqlrow.h"
+
+#include <QSqlQuery>
+#include <QSqlRecord>
+
+SqlRow::SqlRow(const QSqlQuery& query) {
+  int rows = query.record().count();
+  for (int i = 0; i < rows; ++i) {
+    columns_ << query.value(i);
+  }
+}
+

src/library/sqlrow.h

@@ -0,0 +1,22 @@
+#ifndef SQLROW_H
+#define SQLROW_H
+
+#include <QList>
+#include <QVariant>
+
+class QSqlQuery;
+
+class SqlRow {
+ public:
+  // WARNING: Implicit construction from QSqlQuery and LibraryQuery.
+  SqlRow(const QSqlQuery& query);
+
+  QVariant value(int i) const { return columns_[i]; }
+
+ private:
+  SqlRow();
+
+  QList<QVariant> columns_;
+};
+
+#endif

src/playlist/playlist.cpp

@@ -881,6 +881,7 @@ void Playlist::Save() const {
 }
 
 void Playlist::Restore() {
+  qDebug() << Q_FUNC_INFO;
   if (!backend_)
     return;
 
@@ -888,11 +889,23 @@ void Playlist::Restore() {
   virtual_items_.clear();
   library_items_by_id_.clear();
 
-  items_ = backend_->GetPlaylistItems(id_);
+  QFuture<shared_ptr<PlaylistItem> > future = backend_->GetPlaylistItems(id_);
+  QFutureWatcher<shared_ptr<PlaylistItem> >* watcher =
+      new QFutureWatcher<shared_ptr<PlaylistItem> >(this);
+  watcher->setFuture(future);
+  connect(watcher, SIGNAL(finished()), SLOT(ItemsLoaded()));
+}
+
+void Playlist::ItemsLoaded() {
+  QFutureWatcher<shared_ptr<PlaylistItem> >* watcher =
+      static_cast<QFutureWatcher<shared_ptr<PlaylistItem> >*>(sender());
+  watcher->deleteLater();
+
+  items_ = watcher->future().results();
 
   PlaylistBackend::Playlist p = backend_->GetPlaylist(id_);
 
-  for (int i=0 ; i<items_.count() ; ++i) {
+  for (int i = 0 ; i < items_.count() ; ++i) {
     virtual_items_ << i;
 
     if (items_[i]->type() == "Library") {

src/playlist/playlist.h

@@ -203,6 +203,7 @@ class Playlist : public QAbstractListModel {
   void TracksEnqueued(const QModelIndex&, int begin, int end);
   void QueueLayoutChanged();
   void SongSaveComplete();
+  void ItemsLoaded();
 
  private:
   PlaylistFilter* proxy_;

src/playlist/playlistbackend.cpp

@@ -18,9 +18,11 @@
 #include "core/database.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
+#include "library/sqlrow.h"
 
-#include <QtDebug>
 #include <QSqlQuery>
+#include <QtConcurrentMap>
+#include <QtDebug>
 
 using boost::shared_ptr;
 
@@ -72,7 +74,7 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(int id) {
   return p;
 }
 
-PlaylistItemList PlaylistBackend::GetPlaylistItems(int playlist) {
+QFuture<shared_ptr<PlaylistItem> > PlaylistBackend::GetPlaylistItems(int playlist) {
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
@@ -91,22 +93,27 @@ PlaylistItemList PlaylistBackend::GetPlaylistItems(int playlist) {
   q.bindValue(":playlist", playlist);
   q.exec();
   if (db_->CheckErrors(q.lastError()))
-    return ret;
+    return QFuture<shared_ptr<PlaylistItem> >();
+
+  QList<SqlRow> rows;
 
   while (q.next()) {
-    // The song tables gets joined first, plus one each for the song ROWIDs
-    const int row = (Song::kColumns.count() + 1) * 2;
-
-    shared_ptr<PlaylistItem> item(
-        PlaylistItem::NewFromType(q.value(row + 0).toString()));
-    if (!item)
-      continue;
-
-    if (item->InitFromQuery(q))
-      ret << item;
+    rows << SqlRow(q);
   }
 
-  return ret;
+  return QtConcurrent::mapped(rows, &PlaylistBackend::NewSongFromQuery);
+}
+
+shared_ptr<PlaylistItem> PlaylistBackend::NewSongFromQuery(const SqlRow& row) {
+  // The song tables gets joined first, plus one each for the song ROWIDs
+  const int playlist_row = (Song::kColumns.count() + 1) * 2;
+
+  shared_ptr<PlaylistItem> item(
+      PlaylistItem::NewFromType(row.value(playlist_row).toString()));
+  if (item) {
+    item->InitFromQuery(row);
+  }
+  return item;
 }
 
 void PlaylistBackend::SavePlaylistAsync(int playlist, const PlaylistItemList &items,

src/playlist/playlistbackend.h

@@ -17,8 +17,9 @@
 #ifndef PLAYLISTBACKEND_H
 #define PLAYLISTBACKEND_H
 
-#include <QObject>
+#include <QFuture>
 #include <QList>
+#include <QObject>
 
 #include "playlistitem.h"
 
@@ -42,7 +43,7 @@ class PlaylistBackend : public QObject {
 
   PlaylistList GetAllPlaylists();
   Playlist GetPlaylist(int id);
-  PlaylistItemList GetPlaylistItems(int playlist);
+  QFuture<boost::shared_ptr<PlaylistItem> > GetPlaylistItems(int playlist);
   void SavePlaylistAsync(int playlist, const PlaylistItemList& items,
                          int last_played);
   void SetPlaylistOrder(const QList<int>& ids);
@@ -55,6 +56,8 @@ class PlaylistBackend : public QObject {
   void SavePlaylist(int playlist, const PlaylistItemList& items, int last_played);
 
  private:
+  static boost::shared_ptr<PlaylistItem> NewSongFromQuery(const SqlRow& row);
+
   boost::shared_ptr<Database> db_;
 };
 

src/playlist/playlistitem.h

@@ -24,7 +24,7 @@
 
 #include "core/song.h"
 
-class QSqlQuery;
+class SqlRow;
 
 class PlaylistItem {
  public:
@@ -89,7 +89,7 @@ class PlaylistItem {
 
   virtual Options options() const { return Default; }
 
-  virtual bool InitFromQuery(const QSqlQuery& query) = 0;
+  virtual bool InitFromQuery(const SqlRow& query) = 0;
   void BindToQuery(QSqlQuery* query) const;
   virtual void Reload() {}
 

src/playlist/songplaylistitem.cpp

@@ -16,6 +16,8 @@
 
 #include "songplaylistitem.h"
 
+#include "library/sqlrow.h"
+
 #include <QtDebug>
 #include <QFile>
 #include <QSettings>
@@ -31,7 +33,7 @@ SongPlaylistItem::SongPlaylistItem(const Song& song)
 {
 }
 
-bool SongPlaylistItem::InitFromQuery(const QSqlQuery &query) {
+bool SongPlaylistItem::InitFromQuery(const SqlRow& query) {
   // The song tables gets joined first, plus one each for the song ROWIDs
   const int row = (Song::kColumns.count() + 1) * 2;
 

src/playlist/songplaylistitem.h

@@ -25,7 +25,7 @@ class SongPlaylistItem : public PlaylistItem {
   SongPlaylistItem(const QString& type);
   SongPlaylistItem(const Song& song);
 
-  bool InitFromQuery(const QSqlQuery &query);
+  bool InitFromQuery(const SqlRow& query);
   void Reload();
 
   Song Metadata() const;

src/radio/magnatuneplaylistitem.cpp

@@ -13,7 +13,7 @@ MagnatunePlaylistItem::MagnatunePlaylistItem(const Song& song)
   song_ = song;
 }
 
-bool MagnatunePlaylistItem::InitFromQuery(const QSqlQuery &query) {
+bool MagnatunePlaylistItem::InitFromQuery(const SqlRow& query) {
   // Rows from the songs tables come first
   song_.InitFromQuery(query, Song::kColumns.count() + 1);
 

src/radio/magnatuneplaylistitem.h

@@ -8,7 +8,7 @@ class MagnatunePlaylistItem : public LibraryPlaylistItem {
   MagnatunePlaylistItem(const QString& type);
   MagnatunePlaylistItem(const Song& song);
 
-  bool InitFromQuery(const QSqlQuery &query);
+  bool InitFromQuery(const SqlRow& query);
 
   Options options() const;
 

src/radio/radioplaylistitem.cpp

@@ -18,6 +18,7 @@
 #include "radioservice.h"
 #include "radiomodel.h"
 #include "core/settingsprovider.h"
+#include "library/sqlrow.h"
 
 #include <QSettings>
 #include <QApplication>
@@ -40,7 +41,7 @@ RadioPlaylistItem::RadioPlaylistItem(RadioService* service, const QUrl& url,
   InitMetadata();
 }
 
-bool RadioPlaylistItem::InitFromQuery(const QSqlQuery &query) {
+bool RadioPlaylistItem::InitFromQuery(const SqlRow& query) {
   // The song tables gets joined first, plus one each for the song ROWIDs
   const int row = (Song::kColumns.count() + 1) * 2;
 

src/radio/radioplaylistitem.h

@@ -32,7 +32,7 @@ class RadioPlaylistItem : public PlaylistItem {
 
   Options options() const;
 
-  bool InitFromQuery(const QSqlQuery &query);
+  bool InitFromQuery(const SqlRow& query);
   void BindToQuery(QSqlQuery *query) const;
 
   Song Metadata() const;

src/translations/ar.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-21 01:02+0000\n"
 "Last-Translator: EL7R <the-ghost@live.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "X-Launchpad-Export-Date: 2010-05-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "أضِف %n أغاني\\أغنية"
 
@@ -1769,7 +1769,7 @@ msgstr "انقل الأغاني"
 msgid "options"
 msgstr "الخيارات"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "أزِل %n أغاني\\أغنية"
 

src/translations/bg.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-06 14:54+0000\n"
 "Last-Translator: Hristo Apostolov <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "X-Launchpad-Export-Date: 2010-07-07 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/cs.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 03:50+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: cs_CZ\n"
@@ -45,15 +45,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr "Upravit informaci o skladbách..."
 msgid "Edit..."
 msgstr "Upravit..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Úprava %n stop"
 
@@ -1753,7 +1753,7 @@ msgstr "Vynulovat"
 msgid "[click to edit]"
 msgstr "[pro úpravy klikněte]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Přidej %n skladby"
 
@@ -1773,7 +1773,7 @@ msgstr "Přesuň skladby"
 msgid "options"
 msgstr "Možnosti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Odeber %n skladeb"
 

src/translations/da.po

@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-16 21:57+0000\n"
 "Last-Translator: Kabel <CaptainKabel@gmail.com>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "X-Launchpad-Export-Date: 2010-07-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -45,15 +45,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr "Redigér sporinformation..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Redigerer %n spor"
 
@@ -1756,7 +1756,7 @@ msgstr "Nul"
 msgid "[click to edit]"
 msgstr "[Klik for at redigere]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "tilføj %n sange"
 
@@ -1776,7 +1776,7 @@ msgstr "flyt sange"
 msgid "options"
 msgstr "indstillinger"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "fjern %n sange"
 

src/translations/de.po

@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-19 11:13+0000\n"
 "Last-Translator: murrayy <julian.held@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "X-Launchpad-Export-Date: 2010-07-20 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -45,15 +45,15 @@ msgstr "%1 ausgewählt von"
 msgid "%1 tracks"
 msgstr "%1 Stücke"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n fehlgeschlagen"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n konvertiert"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n verbleibend"
 
@@ -597,7 +597,7 @@ msgstr "Metadaten bearbeiten..."
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "%n Stücke bearbeiten"
 
@@ -1779,7 +1779,7 @@ msgstr "Null"
 msgid "[click to edit]"
 msgstr "[zum Bearbeiten klicken]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n Stücke hinzufügen"
 
@@ -1799,7 +1799,7 @@ msgstr "Stücke verschieben"
 msgid "options"
 msgstr "Einstellungen"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n Stücke entfernen"
 

src/translations/el.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-18 09:56+0000\n"
 "Last-Translator: firewalker <Unknown>\n"
 "Language-Team: <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-19 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: el_GR\n"
@@ -46,15 +46,15 @@ msgstr "%1 επιλεγμένα από"
 msgid "%1 tracks"
 msgstr "%1 κομμάτια"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n απέτυχε"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n ολοκληρώθηκε"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n απομένει"
 
@@ -600,7 +600,7 @@ msgstr "Τροποποίηση πληροφοριών κομματιού..."
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Τροποποίηση %n κομματιών"
 
@@ -1784,7 +1784,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[κλικ για τροποποίηση]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "προσθήκη %n τραγουδιών"
 
@@ -1804,7 +1804,7 @@ msgstr "μετακίνηση τραγουδιών"
 msgid "options"
 msgstr "επιλογές"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "αφαίρεση %n τραγουδιών"
 

src/translations/en_CA.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-17 01:37+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-18 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n failed"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n finished"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n remaining"
 
@@ -590,7 +590,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr "Edit..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editing %n tracks"
 
@@ -1754,7 +1754,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click to edit]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "add %n songs"
 
@@ -1774,7 +1774,7 @@ msgstr "move songs"
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remove %n songs"
 

src/translations/en_GB.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-17 01:38+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-18 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editing %n tracks"
 
@@ -1751,7 +1751,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click to edit]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/es.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-19 21:03+0000\n"
 "Last-Translator: Carlos Jenkins Pérez <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-20 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: es_ES\n"
@@ -45,15 +45,15 @@ msgstr "%1 seleccionadas de"
 msgid "%1 tracks"
 msgstr "%1 pistas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n fallaron"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n completado(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n pendiente(s)"
 
@@ -601,7 +601,7 @@ msgstr "Editar información de la pista..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n pistas"
 
@@ -1785,7 +1785,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "agregar %n pistas"
 
@@ -1805,7 +1805,7 @@ msgstr "mover pistas"
 msgid "options"
 msgstr "opciones"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remover %n pistas"
 

src/translations/fi.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-30 12:14+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "X-Launchpad-Export-Date: 2010-07-01 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 kappaletta"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr "Muokkaa kappaleen tietoja..."
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1751,7 +1751,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/fr.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-23 20:36+0000\n"
 "Last-Translator: Arno <arnaud.bienner@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-24 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: fr_FR\n"
@@ -45,15 +45,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 pistes"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n échoué"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n terminé"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n manquant"
 
@@ -593,7 +593,7 @@ msgstr "Modifier la description de la piste..."
 msgid "Edit..."
 msgstr "Éditer..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Éditer %n pistes"
 
@@ -1765,7 +1765,7 @@ msgstr "Zéro"
 msgid "[click to edit]"
 msgstr "[cliquer pour modifier]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1785,7 +1785,7 @@ msgstr "déplacer les chansons"
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/gl.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-04-27 16:34+0000\n"
 "Last-Translator: andreout <andre@outeiro.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "X-Launchpad-Export-Date: 2010-04-28 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1751,7 +1751,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "Opzóns"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/it.po

@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-13 06:56+0000\n"
 "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Launchpad-Export-Date: 2010-07-14 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -45,15 +45,15 @@ msgstr "%1 selezionate di"
 msgid "%1 tracks"
 msgstr "%1 tracce"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n non riusciti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n completati"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n rimanenti"
 
@@ -599,7 +599,7 @@ msgstr "Modifica informazioni traccia..."
 msgid "Edit..."
 msgstr "Modifica..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Modifica di %n tracce"
 
@@ -1789,7 +1789,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clic per modificare]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "aggiungi %n brani"
 
@@ -1809,7 +1809,7 @@ msgstr "sposta brani"
 msgid "options"
 msgstr "opzioni"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "rimuovi %n brani"
 

src/translations/kk.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-04-27 16:33+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "X-Launchpad-Export-Date: 2010-04-28 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1751,7 +1751,7 @@ msgstr "Нөл"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "опциялар"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/lt.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-22 12:24+0000\n"
 "Last-Translator: Kazimieras Aliulis <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 "X-Launchpad-Export-Date: 2010-07-23 04:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "%1 pažymėta iš"
 msgid "%1 tracks"
 msgstr "%1 takeliai"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/nb.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-04-14 22:22+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "X-Launchpad-Export-Date: 2010-04-16 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr "Rediger informasjon om sporet..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Endrer %n spor"
 
@@ -1753,7 +1753,7 @@ msgstr "Null"
 msgid "[click to edit]"
 msgstr "[klikk for å endre]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1773,7 +1773,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/nl.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-15 22:34+0000\n"
 "Last-Translator: Balaam's Miracle <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "X-Launchpad-Export-Date: 2010-07-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "%1 geselecteerd van"
 msgid "%1 tracks"
 msgstr "%1 tracks"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n mislukt"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n voltooid"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n te gaan"
 
@@ -596,7 +596,7 @@ msgstr "Trackinformatie bewerken..."
 msgid "Edit..."
 msgstr "Bewerken..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "%n tracks bewerken"
 
@@ -1778,7 +1778,7 @@ msgstr "Nul"
 msgid "[click to edit]"
 msgstr "[klik om te bewerken]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n nummers toevoegen"
 
@@ -1798,7 +1798,7 @@ msgstr "nummers verplaatsen"
 msgid "options"
 msgstr "opties"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n nummers verwijderen"
 

src/translations/oc.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-21 01:01+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-05-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr "Zèro"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr "opcions"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/pl.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-23 09:51+0000\n"
 "Last-Translator: Patryk Wychowaniec <patryk1303@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-24 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: pl_PL\n"
@@ -45,15 +45,15 @@ msgstr "%1 zaznaczonych z"
 msgid "%1 tracks"
 msgstr "%1 ścieżek"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n zawiodło"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n zakończone"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -594,7 +594,7 @@ msgstr "Edytuj informacje o utworze..."
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Edytowanie %n ścieżek"
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[kliknij aby edytować]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1780,7 +1780,7 @@ msgstr ""
 msgid "options"
 msgstr "opcje"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/pt.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 09:28+0000\n"
 "Last-Translator: Sérgio Marques <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "seleccionada(s) %1 de"
 msgid "%1 tracks"
 msgstr "%1 faixas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n falha(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n concluída(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n restante(s)"
 
@@ -597,7 +597,7 @@ msgstr "Editar a informação da faixa..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1775,7 +1775,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "adicionar %n canções"
 
@@ -1795,7 +1795,7 @@ msgstr "mover canções"
 msgid "options"
 msgstr "opções"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remover %n canções"
 

src/translations/pt_BR.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-26 18:01+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "X-Launchpad-Export-Date: 2010-06-27 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "%1 selecionado(s) de"
 msgid "%1 tracks"
 msgstr "%1 faixas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n falhou"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n fizalizado"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n faltando"
 
@@ -593,7 +593,7 @@ msgstr "Editar informações da faixa..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1769,7 +1769,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Adicionar %n músicas"
 
@@ -1789,7 +1789,7 @@ msgstr "mover músicas"
 msgid "options"
 msgstr "opções"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Remover %n músicas"
 

src/translations/ro.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-03 21:09+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "X-Launchpad-Export-Date: 2010-05-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1750,7 +1750,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1770,7 +1770,7 @@ msgstr ""
 msgid "options"
 msgstr "opțiuni"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/ru.po

@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 06:51+0000\n"
 "Last-Translator: Pavel Maleev <Unknown>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -43,15 +43,15 @@ msgstr "%1 выбрано из"
 msgid "%1 tracks"
 msgstr "%1 композиций"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n с ошибкой"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завершено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n осталось"
 
@@ -595,7 +595,7 @@ msgstr "Изменить информацию о композиции..."
 msgid "Edit..."
 msgstr "Изменить..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Редактирую %n треков"
 
@@ -1775,7 +1775,7 @@ msgstr "По-умолчанию"
 msgid "[click to edit]"
 msgstr "[щелкните, чтобы изменить]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "добавить %n композиций"
 
@@ -1795,7 +1795,7 @@ msgstr "переместить композиции"
 msgid "options"
 msgstr "настройки"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "удалить %n композиций"
 

src/translations/sk.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 09:42+0000\n"
 "Last-Translator: DAG Software <Unknown>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: sk_SK\n"
@@ -45,15 +45,15 @@ msgstr "%1 vybratých z"
 msgid "%1 tracks"
 msgstr "%1 skladieb"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n zlyhalo"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n dokončených"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n zostávajúcich"
 
@@ -597,7 +597,7 @@ msgstr "Upravť informácie o skladbe..."
 msgid "Edit..."
 msgstr "Upraviť..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Upravovanie %n skladieb"
 
@@ -1773,7 +1773,7 @@ msgstr "Vynulovať"
 msgid "[click to edit]"
 msgstr "[kliknite pre úpravu]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "pridať %n piesní"
 
@@ -1793,7 +1793,7 @@ msgstr "presunúť piesne"
 msgid "options"
 msgstr "možnosti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "odstrániť %n piesní"
 

src/translations/sr.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-23 16:01+0000\n"
 "Last-Translator: Далибор Ђурић <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
 "X-Launchpad-Export-Date: 2010-07-24 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 нумера"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завршено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n преостало"
 
@@ -590,7 +590,7 @@ msgstr "Уреди податке о нумери..."
 msgid "Edit..."
 msgstr "Уреди..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Уређивање %n нумера"
 
@@ -1756,7 +1756,7 @@ msgstr "Нулто"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "додај %n песама"
 
@@ -1776,7 +1776,7 @@ msgstr ""
 msgid "options"
 msgstr "Опције"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remove %n песама"
 

src/translations/sv.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-21 16:23+0000\n"
 "Last-Translator: alopex <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "X-Launchpad-Export-Date: 2010-07-22 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n misslyckades"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n färdig"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n återstår"
 
@@ -590,7 +590,7 @@ msgstr "Redigera spårinformation..."
 msgid "Edit..."
 msgstr "Redigera..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Redigerar %n spår"
 
@@ -1757,7 +1757,7 @@ msgstr "Noll"
 msgid "[click to edit]"
 msgstr "[klicka för att redigera]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Lägg till %n songer"
 
@@ -1777,7 +1777,7 @@ msgstr "Flytta songer"
 msgid "options"
 msgstr "alternativ"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Ta bort %n songer"
 

src/translations/tr.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-15 05:59+0000\n"
 "Last-Translator: Cihan Ersoy <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "X-Launchpad-Export-Date: 2010-07-16 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 parça"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n başarısız"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n tamamlandı"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n kalan"
 
@@ -588,7 +588,7 @@ msgstr "Parça bilgisini düzenle..."
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1755,7 +1755,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[düzenlemek için tıklayın]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n şakıyı ekle"
 
@@ -1775,7 +1775,7 @@ msgstr "Parçaları taşı"
 msgid "options"
 msgstr "seçenekler"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n şakıyı çıkart"
 

src/translations/translations.pot

@@ -34,15 +34,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -578,7 +578,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1739,7 +1739,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1759,7 +1759,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/uk.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 06:52+0000\n"
 "Last-Translator: Sergiy Gavrylov <sergiovana@bigmir.net>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "вибрано з %1"
 msgid "%1 tracks"
 msgstr "%1 доріжок"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n з помилкою"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завершено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n залишилось"
 
@@ -596,7 +596,7 @@ msgstr "Редагувати дані про доріжку..."
 msgid "Edit..."
 msgstr "Змінити..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Редагування %n доріжок"
 
@@ -1774,7 +1774,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[клацніть, щоб змінити]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "додати %n композицій"
 
@@ -1794,7 +1794,7 @@ msgstr "перемістити композиції"
 msgid "options"
 msgstr "параметри"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "вилучити %n композицій"
 

src/translations/zh_CN.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-07 01:43+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-08 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr "选项"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 

src/translations/zh_TW.po

@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-20 03:55+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,15 +44,15 @@ msgstr "%1 選定"
 msgid "%1 tracks"
 msgstr "%1 歌曲"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n 失敗的"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n 完成的"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n 剩餘的"
 
@@ -592,7 +592,7 @@ msgstr "編輯歌曲資訊..."
 msgid "Edit..."
 msgstr "編輯..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "編輯 %n 歌曲"
 
@@ -1756,7 +1756,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[點擊以編輯]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "加入 %n 歌"
 
@@ -1776,7 +1776,7 @@ msgstr "移動歌曲"
 msgid "options"
 msgstr "選項"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "移除 %n 歌"
 

src/ui/albumcovermanager.cpp

@@ -21,6 +21,7 @@
 #include "core/albumcoverfetcher.h"
 #include "library/librarybackend.h"
 #include "library/libraryquery.h"
+#include "library/sqlrow.h"
 
 #include <QSettings>
 #include <QPainter>