Start gstreamer playing from a separate thread.

2025-02-01 20:06:53 +01:00 · 2010-08-04 12:13:43 +00:00 · 2010-08-04 12:13:43 +00:00 · 35e87b2a77
commit 35e87b2a77
parent 1cbd0af8fb
36 changed files with 274 additions and 232 deletions
--- a/src/core/boundfuturewatcher.h
+++ b/src/core/boundfuturewatcher.h
@ -0,0 +1,25 @@
+#ifndef BOUNDFUTUREWATCHER_H
+#define BOUNDFUTUREWATCHER_H
+
+#include <QFutureWatcher>
+
+#include <boost/noncopyable.hpp>
+
+template <typename T, typename D>
+class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {
+ public:
+  BoundFutureWatcher(D data, QObject* parent = 0)
+      : QFutureWatcher<T>(parent),
+        data_(data) {
+  }
+
+  ~BoundFutureWatcher() {
+  }
+
+  D data() const { return data_; }
+
+ private:
+  D data_;
+};
+
+#endif
--- a/src/engines/gstengine.cpp
+++ b/src/engines/gstengine.cpp
@ -24,6 +24,7 @@
 #include "config.h"
 #include "gstengine.h"
 #include "gstenginepipeline.h"
+#include "core/boundfuturewatcher.h"

 #ifdef HAVE_IMOBILEDEVICE
 # include "gstafcsrc/gstafcsrc.h"
@ -490,33 +491,46 @@ void GstEngine::StartFadeout() {


 bool GstEngine::Play( uint offset ) {
-  // Try to play input pipeline; if fails, destroy input bin
-  forever {
-    if (current_pipeline_->SetState(GST_STATE_PLAYING))
-      break; // Success
+  QFuture<GstStateChangeReturn> future = current_pipeline_->SetState(GST_STATE_PLAYING);
+  BoundFutureWatcher<GstStateChangeReturn, uint>* watcher =
+      new BoundFutureWatcher<GstStateChangeReturn, uint>(offset, this);
+  watcher->setFuture(future);
+  connect(watcher, SIGNAL(finished()), SLOT(PlayDone()));

+  return true;
+}
+
+void GstEngine::PlayDone() {
+  BoundFutureWatcher<GstStateChangeReturn, uint>* watcher =
+      static_cast<BoundFutureWatcher<GstStateChangeReturn, uint>*>(sender());
+  watcher->deleteLater();
+  GstStateChangeReturn ret = watcher->result();
+
+  if (ret == GST_STATE_CHANGE_FAILURE) {
    // Failure, but we got a redirection URL - try loading that instead
    QUrl redirect_url = current_pipeline_->redirect_url();
    if (!redirect_url.isEmpty() && redirect_url != current_pipeline_->url()) {
      qDebug() << "Redirecting to" << redirect_url;
      current_pipeline_ = CreatePipeline(redirect_url);
-      continue;
+      Play(watcher->data());
+      return;
    }

    // Failure - give up
    qWarning() << "Could not set thread to PLAYING.";
    current_pipeline_.reset();
-    return false;
+    return;
  }

-  // If "Resume playback on start" is enabled, we must seek to the last position
-  if (offset) Seek(offset);
-
  StartTimers();

  current_sample_ = 0;
+
+  if (watcher->data()) {
+    Seek(watcher->data());
+  }
+
  emit StateChanged(Engine::Playing);
-  return true;
 }


--- a/src/engines/gstengine.h
+++ b/src/engines/gstengine.h
@ -116,6 +116,7 @@ class GstEngine : public Engine::Base, public BufferConsumer {
  void FadeoutFinished();
  void SeekNow();
  void BackgroundStreamFinished();
+  void PlayDone();

 private:
  // Callbacks
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@ -19,6 +19,7 @@
 #include "bufferconsumer.h"

 #include <QDebug>
+#include <QtConcurrentRun>

 const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
 const int GstEnginePipeline::kFaderFudgeMsec = 2000;
@ -448,8 +449,8 @@ GstState GstEnginePipeline::state() const {
  return s;
 }

-bool GstEnginePipeline::SetState(GstState state) {
-  return gst_element_set_state(pipeline_, state) != GST_STATE_CHANGE_FAILURE;
+QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(GstState state) {
+  return QtConcurrent::run(&gst_element_set_state, pipeline_, state);
 }

 bool GstEnginePipeline::Seek(qint64 nanosec) {
--- a/src/engines/gstenginepipeline.h
+++ b/src/engines/gstenginepipeline.h
@ -17,11 +17,12 @@
 #ifndef GSTENGINEPIPELINE_H
 #define GSTENGINEPIPELINE_H

-#include <QObject>
-#include <QUrl>
-#include <QTimeLine>
 #include <QBasicTimer>
+#include <QFuture>
 #include <QMutex>
+#include <QObject>
+#include <QTimeLine>
+#include <QUrl>

 #include <gst/gst.h>
 #include <boost/scoped_ptr.hpp>
@ -54,7 +55,7 @@ class GstEnginePipeline : public QObject {
  void RemoveAllBufferConsumers();

  // Control the music playback
-  bool SetState(GstState state);
+  QFuture<GstStateChangeReturn> SetState(GstState state);
  bool Seek(qint64 nanosec);
  void SetEqualizerEnabled(bool enabled);
  void SetEqualizerParams(int preamp, const QList<int>& band_gains);
--- a/src/translations/ar.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "أضِف %n أغاني\\أغنية"

@ -1769,7 +1769,7 @@ msgstr "انقل الأغاني"
 msgid "options"
 msgstr "الخيارات"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "أزِل %n أغاني\\أغنية"

--- a/src/translations/bg.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/cs.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -589,7 +589,7 @@ msgstr "Upravit informaci o skladbách..."
 msgid "Edit..."
 msgstr "Upravit..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "Odeber %n skladeb"

--- a/src/translations/da.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -589,7 +589,7 @@ msgstr "Redigér sporinformation..."
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "tilføj %n sange"

@ -1776,7 +1776,7 @@ msgstr "flyt sange"
 msgid "options"
 msgstr "indstillinger"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "fjern %n sange"

--- a/src/translations/de.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n fehlgeschlagen"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n konvertiert"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n verbleibend"

@ -597,7 +597,7 @@ msgstr "Metadaten bearbeiten..."
 msgid "Edit..."
 msgstr "Bearbeiten..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "%n Stücke entfernen"

--- a/src/translations/el.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n απέτυχε"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n ολοκληρώθηκε"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n απομένει"

@ -600,7 +600,7 @@ msgstr "Τροποποίηση πληροφοριών κομματιού..."
 msgid "Edit..."
 msgstr "Επεξεργασία..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "Τροποποίηση %n κομματιών"

@ -1784,7 +1784,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[κλικ για τροποποίηση]"

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "προσθήκη %n τραγουδιών"

@ -1804,7 +1804,7 @@ msgstr "μετακίνηση τραγουδιών"
 msgid "options"
 msgstr "επιλογές"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "αφαίρεση %n τραγουδιών"

--- a/src/translations/en_CA.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n failed"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n finished"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n remaining"

@ -590,7 +590,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr "Edit..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "add %n songs"

@ -1774,7 +1774,7 @@ msgstr "move songs"
 msgid "options"
 msgstr "options"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "remove %n songs"

--- a/src/translations/en_GB.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "options"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/es.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n fallaron"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n completado(s)"

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "agregar %n pistas"

@ -1805,7 +1805,7 @@ msgstr "mover pistas"
 msgid "options"
 msgstr "opciones"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "remover %n pistas"

--- a/src/translations/fi.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr "Muokkaa kappaleen tietoja..."
 msgid "Edit..."
 msgstr "Muokkaa..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1751,7 +1751,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/fr.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n échoué"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n terminé"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n manquant"

@ -593,7 +593,7 @@ msgstr "Modifier la description de la piste..."
 msgid "Edit..."
 msgstr "Éditer..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1785,7 +1785,7 @@ msgstr "déplacer les chansons"
 msgid "options"
 msgstr "options"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/gl.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"

@ -1751,7 +1751,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[clique para editar]"

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "Opzóns"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/it.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n non riusciti"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n completati"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n rimanenti"

@ -599,7 +599,7 @@ msgstr "Modifica informazioni traccia..."
 msgid "Edit..."
 msgstr "Modifica..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "aggiungi %n brani"

@ -1809,7 +1809,7 @@ msgstr "sposta brani"
 msgid "options"
 msgstr "opzioni"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "rimuovi %n brani"

--- a/src/translations/kk.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1751,7 +1751,7 @@ msgstr "Нөл"
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1771,7 +1771,7 @@ msgstr ""
 msgid "options"
 msgstr "опциялар"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/lt.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/nb.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr "Rediger informasjon om sporet..."
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1773,7 +1773,7 @@ msgstr ""
 msgid "options"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/nl.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n mislukt"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n voltooid"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n te gaan"

@ -596,7 +596,7 @@ msgstr "Trackinformatie bewerken..."
 msgid "Edit..."
 msgstr "Bewerken..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "%n nummers toevoegen"

@ -1798,7 +1798,7 @@ msgstr "nummers verplaatsen"
 msgid "options"
 msgstr "opties"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "%n nummers verwijderen"

--- a/src/translations/oc.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1749,7 +1749,7 @@ msgstr "Zèro"
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr "opcions"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/pl.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n zawiodło"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n zakończone"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -594,7 +594,7 @@ msgstr "Edytuj informacje o utworze..."
 msgid "Edit..."
 msgstr "Edytuj..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1780,7 +1780,7 @@ msgstr ""
 msgid "options"
 msgstr "opcje"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/pt.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n falha(s)"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n concluída(s)"

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "remover %n canções"

--- a/src/translations/pt_BR.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n falhou"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n fizalizado"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n faltando"

@ -593,7 +593,7 @@ msgstr "Editar informações da faixa..."
 msgid "Edit..."
 msgstr "Editar..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "Remover %n músicas"

--- a/src/translations/ro.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1750,7 +1750,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1770,7 +1770,7 @@ msgstr ""
 msgid "options"
 msgstr "opțiuni"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/ru.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n с ошибкой"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n завершено"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n осталось"

@ -595,7 +595,7 @@ msgstr "Изменить информацию о композиции..."
 msgid "Edit..."
 msgstr "Изменить..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "Редактирую %n треков"

@ -1775,7 +1775,7 @@ msgstr "По-умолчанию"
 msgid "[click to edit]"
 msgstr "[щелкните, чтобы изменить]"

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "добавить %n композиций"

@ -1795,7 +1795,7 @@ msgstr "переместить композиции"
 msgid "options"
 msgstr "настройки"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "удалить %n композиций"

--- a/src/translations/sk.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n zlyhalo"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n dokončených"

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "pridať %n piesní"

@ -1793,7 +1793,7 @@ msgstr "presunúť piesne"
 msgid "options"
 msgstr "možnosti"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "odstrániť %n piesní"

--- a/src/translations/sr.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n завршено"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n преостало"

@ -590,7 +590,7 @@ msgstr "Уреди податке о нумери..."
 msgid "Edit..."
 msgstr "Уреди..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "Уређивање %n нумера"

@ -1756,7 +1756,7 @@ msgstr "Нулто"
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "додај %n песама"

@ -1776,7 +1776,7 @@ msgstr ""
 msgid "options"
 msgstr "Опције"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "remove %n песама"

--- a/src/translations/sv.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n misslyckades"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n färdig"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n återstår"

@ -590,7 +590,7 @@ msgstr "Redigera spårinformation..."
 msgid "Edit..."
 msgstr "Redigera..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "Lägg till %n songer"

@ -1777,7 +1777,7 @@ msgstr "Flytta songer"
 msgid "options"
 msgstr "alternativ"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "Ta bort %n songer"

--- a/src/translations/tr.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n başarısız"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n tamamlandı"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n kalan"

@ -588,7 +588,7 @@ msgstr "Parça bilgisini düzenle..."
 msgid "Edit..."
 msgstr "Düzenle..."

-#, c-format, qt-plural-format
+#, c-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, qt-plural-format
+#, c-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, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "%n şakıyı çıkart"

--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@ -34,15 +34,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -578,7 +578,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1739,7 +1739,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1759,7 +1759,7 @@ msgstr ""
 msgid "options"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/uk.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n з помилкою"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n завершено"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n залишилось"

@ -596,7 +596,7 @@ msgstr "Редагувати дані про доріжку..."
 msgid "Edit..."
 msgstr "Змінити..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "Редагування %n доріжок"

@ -1774,7 +1774,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[клацніть, щоб змінити]"

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "додати %n композицій"

@ -1794,7 +1794,7 @@ msgstr "перемістити композиції"
 msgid "options"
 msgstr "параметри"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "вилучити %n композицій"

--- a/src/translations/zh_CN.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr ""

@ -588,7 +588,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr ""

@ -1749,7 +1749,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr ""

@ -1769,7 +1769,7 @@ msgstr ""
 msgid "options"
 msgstr "选项"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr ""

--- a/src/translations/zh_TW.po
+++ b/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, qt-plural-format
+#, c-format
 msgid "%n failed"
 msgstr "%n 失敗的"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n finished"
 msgstr "%n 完成的"

-#, c-format, qt-plural-format
+#, c-format
 msgid "%n remaining"
 msgstr "%n 剩餘的"

@ -592,7 +592,7 @@ msgstr "編輯歌曲資訊..."
 msgid "Edit..."
 msgstr "編輯..."

-#, c-format, qt-plural-format
+#, c-format
 msgid "Editing %n tracks"
 msgstr "編輯 %n 歌曲"

@ -1756,7 +1756,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[點擊以編輯]"

-#, c-format, qt-plural-format
+#, c-format
 msgid "add %n songs"
 msgstr "加入 %n 歌"

@ -1776,7 +1776,7 @@ msgstr "移動歌曲"
 msgid "options"
 msgstr "選項"

-#, c-format, qt-plural-format
+#, c-format
 msgid "remove %n songs"
 msgstr "移除 %n 歌"